Merge branch 'wip-mdl-29331' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:57:39 +0000 (11:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:57:39 +0000 (11:57 +1300)

Trivial merge