Merge branch 'wip-MDL-55844-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:08:17 +0000 (16:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:08:17 +0000 (16:08 +0200)

Trivial merge