Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 00:31:44 +0000 (12:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 00:31:44 +0000 (12:31 +1200)

Trivial merge