Merge branch 'wip-mdl-41605' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 22:50:08 +0000 (10:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 22:50:08 +0000 (10:50 +1200)

Trivial merge