Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 23:36:52 +0000 (12:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 23:36:52 +0000 (12:36 +1300)

Trivial merge