Merge branch 'MDL-50766_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:02:25 +0000 (23:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:02:25 +0000 (23:02 +0200)

Trivial merge