Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:19:06 +0000 (11:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Sep 2014 22:19:06 +0000 (11:19 +1300)

Trivial merge