Merge branch 'MDL-57977-master' of git://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 19:09:55 +0000 (21:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 19:09:55 +0000 (21:09 +0200)

Trivial merge