Merge branch 'wip-mdl-25937' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 05:01:00 +0000 (17:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 05:01:00 +0000 (17:01 +1200)

Trivial merge