Merge branch 'wip-mdl-30391' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:29:33 +0000 (11:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:29:33 +0000 (11:29 +1300)

Trivial merge