Merge branch 'MDL-37548-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:46:13 +0000 (17:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:46:13 +0000 (17:46 +1300)
commit635bc28d98638128abf3e47259c61e101157c617
tree30faab437a4e51c5e5b6fee6c87a3242ddaed037
parentbe54d2015d564b4bb523f91e460f0d69a9bfe48e
parent073987305250c9a39a0b46f061d937c1e540a410
Merge branch 'MDL-37548-m' of git://github.com/andrewnicols/moodle
lib/adminlib.php