Merge branch 'MDL-62649-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:45:13 +0000 (01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:45:13 +0000 (01:45 +0200)

Trivial merge