Merge branch 'MDL-64987-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2019 23:21:07 +0000 (00:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2019 23:21:07 +0000 (00:21 +0100)

Trivial merge