Merge branch 'wip-MDL-61808-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 07:59:43 +0000 (09:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 07:59:43 +0000 (09:59 +0200)

Trivial merge