Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 17:23:36 +0000 (18:23 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 17:23:36 +0000 (18:23 +0100)
1  2 
lang/en/admin.php

Simple merge