Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 08:20:27 +0000 (16:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 08:20:27 +0000 (16:20 +0800)

Trivial merge