Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)

Trivial merge