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)
1  2 
lang/en/role.php

Simple merge