Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:45:37 +0000 (00:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:45:37 +0000 (00:45 +0200)

Trivial merge