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

Simple merge