Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:56:14 +0000 (20:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jun 2014 18:56:14 +0000 (20:56 +0200)

Trivial merge