Merge branch 'MDL-51148-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Aug 2015 10:46:11 +0000 (12:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Aug 2015 10:46:11 +0000 (12:46 +0200)

Trivial merge