Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:00:20 +0000 (11:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:00:20 +0000 (11:00 +1200)

Trivial merge