Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 02:54:24 +0000 (10:54 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 02:54:24 +0000 (10:54 +0800)
1  2 
admin/roles/assign.php
lib/adminlib.php

Simple merge
Simple merge