Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:06:40 +0000 (20:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:06:40 +0000 (20:06 +1300)

Trivial merge