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

Trivial merge