Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:56:27 +0000 (08:56 +1300)

Trivial merge