Merge branch 'wip-mdl-45698' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 29 May 2014 02:27:56 +0000 (14:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 29 May 2014 02:27:56 +0000 (14:27 +1200)

Trivial merge