Merge branch 'wip-MDL-46059-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 03:15:12 +0000 (15:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 03:15:12 +0000 (15:15 +1200)

Trivial merge