Merge branch 'wip-MDL-45280-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 00:22:44 +0000 (12:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 00:22:44 +0000 (12:22 +1200)

Trivial merge