Merge branch 'wip-MDL-51241-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 04:22:20 +0000 (12:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 04:22:20 +0000 (12:22 +0800)

Trivial merge