Merge branch 'MDL-55661-master-enfix' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 06:40:03 +0000 (14:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 06:40:03 +0000 (14:40 +0800)
1  2 
lang/en/admin.php

Simple merge