Merge branch 'MDL-58000-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:39:27 +0000 (23:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:39:27 +0000 (23:39 +0200)

Trivial merge