Merge branch 'MDL-61979-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:44:16 +0000 (02:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:44:16 +0000 (02:44 +0200)

Trivial merge