Merge branch 'MDL-53071-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 10:01:15 +0000 (11:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 10:01:15 +0000 (11:01 +0100)

Trivial merge