Merge branch 'wip-MDL-59736-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 10:10:36 +0000 (12:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 10:10:36 +0000 (12:10 +0200)

Trivial merge