Merge branch 'MDL-61637_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:09:02 +0000 (18:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:09:02 +0000 (18:09 +0200)

Trivial merge