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

Trivial merge