Merge branch 'wip-MDL-51840-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Oct 2015 03:13:44 +0000 (11:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 27 Oct 2015 03:13:44 +0000 (11:13 +0800)

Trivial merge