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

Trivial merge