Merge branch 'wip-mdl-32150' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 22:33:06 +0000 (10:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Apr 2012 22:33:06 +0000 (10:33 +1200)

Trivial merge