Merge branch 'wip-MDL-59125-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 19:45:38 +0000 (21:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 19:45:38 +0000 (21:45 +0200)

Trivial merge