Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 09:21:29 +0000 (17:21 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 May 2011 09:21:29 +0000 (17:21 +0800)

Trivial merge