Merge branch 'MDL-46231-master-en_fix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 07:32:32 +0000 (08:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 07:32:32 +0000 (08:32 +0100)

Trivial merge