Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 07:20:47 +0000 (15:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 07:20:47 +0000 (15:20 +0800)

Trivial merge