Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:39:54 +0000 (10:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 22:39:54 +0000 (10:39 +1200)

Trivial merge