Merge branch 'MDL-61535-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:34:31 +0000 (01:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:34:31 +0000 (01:34 +0100)

Trivial merge