Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:10:24 +0000 (13:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:10:24 +0000 (13:10 +1200)

Trivial merge