Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:00:46 +0000 (08:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:00:46 +0000 (08:00 +0200)

Trivial merge