Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 20:13:48 +0000 (22:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 20:13:48 +0000 (22:13 +0200)

Trivial merge