Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 22:44:49 +0000 (11:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 22:44:49 +0000 (11:44 +1300)

Trivial merge