Merge branch 'MDL-63002_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 14:15:16 +0000 (16:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 14:15:16 +0000 (16:15 +0200)

Trivial merge