Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:10:31 +0000 (14:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:10:31 +0000 (14:10 +0800)

Trivial merge