Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 02:30:16 +0000 (14:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Sep 2013 02:30:16 +0000 (14:30 +1200)

Trivial merge