Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:25:51 +0000 (17:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:25:51 +0000 (17:25 +1300)
commit682a1c0108afb4d28530341abaf02a1efc4f6105
treeda85936fa76a543a386cb2f3815353d6086adacf
parentd8ef2bc03c6b64d5a60e67f4e90ce343b241af30
parentba4b17dc55ab36438cee6c84fabac867a9d15f6a
Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle
admin/roles/lib.php