Merge branch 'wip-MDL-46623-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Oct 2015 05:26:32 +0000 (13:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Oct 2015 05:26:32 +0000 (13:26 +0800)

Trivial merge