Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)

Trivial merge