Merge branch 'MDL-52938-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:02 +0000 (00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:02 +0000 (00:30 +0100)

Trivial merge