Merge branch 'wip-MDL-51486-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 03:35:38 +0000 (11:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 03:35:38 +0000 (11:35 +0800)

Trivial merge