Merge branch 'MDL-62366-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:13:44 +0000 (18:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:13:44 +0000 (18:13 +0200)

Trivial merge