Merge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jul 2014 21:04:01 +0000 (09:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jul 2014 21:04:01 +0000 (09:04 +1200)

Trivial merge