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

Trivial merge