Merge branch 'MDL-51686-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:19:06 +0000 (20:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 19:19:06 +0000 (20:19 +0100)

Trivial merge