Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)

Trivial merge