Merge branch 'wip-MDL-53129-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:22:49 +0000 (13:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:22:49 +0000 (13:22 +0800)

Trivial merge