Merge branch 'MDL-67625-master' of git://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:26:13 +0000 (00:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:26:13 +0000 (00:26 +0100)

Trivial merge