Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:31:34 +0000 (09:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:31:34 +0000 (09:31 +1200)

Trivial merge