Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Apr 2017 07:55:45 +0000 (09:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Apr 2017 07:55:45 +0000 (09:55 +0200)

Trivial merge