Merge branch 'MDL-65543-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2019 17:25:55 +0000 (19:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2019 17:38:27 +0000 (19:38 +0200)

Trivial merge