Merge branch 'wip-mdl-41557' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:46:07 +0000 (13:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:46:07 +0000 (13:46 +1200)

Trivial merge