Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)

Trivial merge