Merge branch 'MDL-64609-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:05:26 +0000 (18:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:05:26 +0000 (18:05 +0100)

Trivial merge