Merge branch 'mdl45232' of https://github.com/tlevi/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:23:33 +0000 (14:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:23:33 +0000 (14:23 +1200)

Trivial merge