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)
commit6658ef6cd91364f26bc4699b99d2407dd84d89f3
tree31d884e68c2bfb5c872db6d30e5bdeb4ebdadc84
parenta57e3d3b1ff79d7080ec766d90de94be700bda1a
parentab3759fff5e9d301b039ce94e871df820414ba61
Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle
lang/en/admin.php