Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Feb 2016 16:29:07 +0000 (17:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Feb 2016 16:29:07 +0000 (17:29 +0100)

Trivial merge