Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)

Trivial merge