Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 5 Jan 2017 10:09:17 +0000 (10:09 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 5 Jan 2017 10:09:17 +0000 (10:09 +0000)
commit7716be5ae84eb8ad96927d2f573a55c6f52b388f
tree8e9f0effa0932a554738cd0b18d8b6c967649075
parente0d1efd896e097d84331a5586e66be52e223cc63
parent1882e6ecac3ebc488772f5ea36e5f85e62cceb34
Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
lang/en/admin.php