Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)

Trivial merge