Merge branch 'MDL-62460-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:41:37 +0000 (01:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:41:37 +0000 (01:41 +0200)

Trivial merge