Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)

Trivial merge