Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:36:51 +0000 (12:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:36:51 +0000 (12:36 +0200)

Trivial merge