Merge branch 'MDL-49041' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:08:20 +0000 (21:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:08:20 +0000 (21:08 +0100)

Trivial merge