Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 05:20:37 +0000 (18:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 05:20:37 +0000 (18:20 +1300)

Trivial merge