Merge branch 'MDL-49058-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:09:38 +0000 (13:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:09:38 +0000 (13:09 +0100)

Trivial merge