Merge branch 'MDL-40036-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:01:54 +0000 (14:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 02:01:54 +0000 (14:01 +1200)

Trivial merge