Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 09:48:10 +0000 (11:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 09:48:10 +0000 (11:48 +0200)

Trivial merge