Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 04:36:05 +0000 (16:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 04:36:05 +0000 (16:36 +1200)

Trivial merge