Merge branch 'MDL-54549-master-en_fix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 09:28:08 +0000 (10:28 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 09:28:08 +0000 (10:28 +0100)

Trivial merge