Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:33:25 +0000 (09:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:33:25 +0000 (09:33 +1200)

Trivial merge