Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 22:59:19 +0000 (00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 22:59:19 +0000 (00:59 +0200)

Trivial merge