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)
1  2 
lang/en/admin.php

Simple merge