Merge branch 'MDL-62834' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:46:33 +0000 (00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:46:33 +0000 (00:46 +0200)

Trivial merge