Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 09:36:17 +0000 (10:36 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 09:36:17 +0000 (10:36 +0100)
commitcd7b48a2e79c6892ae9f712ebd3ab80eb5e47e0b
tree06594ff547cc46ef30621f1aaa468fa331c83b3c
parent522c7fd350eba16fb79cb4294373ea58b6f75189
parent7a4ff165cb1c99edd084862969e30b1e1231bad1
Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle
lang/en/role.php