Merge branch 'mdl45982-master' of https://github.com/tlock/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:26:36 +0000 (13:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:26:36 +0000 (13:26 +1200)

Trivial merge