Merge branch 'MDL-50489-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:12:12 +0000 (19:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 17:12:12 +0000 (19:12 +0200)

Trivial merge