Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:32:28 +0000 (10:32 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:32:28 +0000 (10:32 +1200)

Trivial merge