Merge branch 'MDL-52814' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:04 +0000 (16:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:04 +0000 (16:48 +0100)

Trivial merge