Merge branch 'wip-MDL-55654-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:14:00 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:14:00 +0000 (19:14 +0200)

Trivial merge