Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:29:11 +0000 (09:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:29:11 +0000 (09:29 +1300)

Trivial merge