Merge branch 'MDL-65558-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2019 09:29:53 +0000 (11:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2019 09:29:53 +0000 (11:29 +0200)

Trivial merge