Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)

Trivial merge