Merge branch 'wip-MDL-51552-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2015 03:01:00 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2015 03:01:00 +0000 (11:01 +0800)

Trivial merge