Merge branch 'wip-mdl-27837' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:03:22 +0000 (21:03 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:03:22 +0000 (21:03 +1000)

Trivial merge