Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 15 Feb 2012 03:23:57 +0000 (16:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 15 Feb 2012 03:23:57 +0000 (16:23 +1300)

Trivial merge