Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 04:15:24 +0000 (16:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 04:15:24 +0000 (16:15 +1200)

Trivial merge