Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 19:43:51 +0000 (08:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 19:43:51 +0000 (08:43 +1300)

Trivial merge