Merge branch 'MDL-50572-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 10:58:35 +0000 (12:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 10:58:35 +0000 (12:58 +0200)

Trivial merge