Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 28 May 2014 20:12:32 +0000 (08:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 28 May 2014 20:12:32 +0000 (08:12 +1200)

Trivial merge