Merge branch 'wip-MDL-62796-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 Jul 2018 10:21:42 +0000 (12:21 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 Jul 2018 10:21:42 +0000 (12:21 +0200)

Trivial merge