Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:12:22 +0000 (23:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:12:22 +0000 (23:12 +0200)

Trivial merge