Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 21:07:34 +0000 (09:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 21:07:34 +0000 (09:07 +1200)

Trivial merge