Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 05:09:23 +0000 (13:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 05:09:23 +0000 (13:09 +0800)
1  2 
admin/roles/override.php

Simple merge