Merge branch 'wip-MDL-52397-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 00:33:41 +0000 (08:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 00:33:41 +0000 (08:33 +0800)

Trivial merge