Merge branch 'MDL-62430_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 00:56:00 +0000 (02:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 00:56:00 +0000 (02:56 +0200)

Trivial merge