Merge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Feb 2014 20:21:54 +0000 (09:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Feb 2014 20:21:54 +0000 (09:21 +1300)

Trivial merge