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)
commite9091a28f5e5f9066f5b6c552b48cd87059ac423
treeec35fcdef4799be147f3b57f6b76f5a22dab9477
parent9d841c6c90985c2e00f025d06b14716a1c372bed
parent4d83abd05222bbd0ff97ead9199f31c9eb5a5cd0
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
admin/roles/assign.php
lib/adminlib.php