Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:10:05 +0000 (10:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:10:05 +0000 (10:10 +1200)

Trivial merge