Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 11:17:05 +0000 (12:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 11:17:05 +0000 (12:17 +0100)
commit3e5bcbf85101ccfad7c340bfede76777b3ca7820
tree2591b47fe2e53fb0a712224ec26f3bb6dcbb525a
parent85a930f628e6cc12a059bde4502b6c9adb5b2ac2
parent2493568970c85a6f33f04c79d50d214a4724cacf
Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle
lang/en/role.php