Merge branch 'wip-mdl-31529' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 02:28:26 +0000 (15:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 02:28:26 +0000 (15:28 +1300)

Trivial merge