Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 01:00:27 +0000 (09:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2015 01:00:27 +0000 (09:00 +0800)

Trivial merge