Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 04:42:12 +0000 (16:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 04:42:12 +0000 (16:42 +1200)

Trivial merge