Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 22:14:14 +0000 (10:14 +1200)
commitaae402010b49e51bd6844d9de45eaa8637fe6d55
tree4aa04d5e0fbb7d3a29c14e13afa0cc2eee21de28
parent6e498020717c9a077f0d5da698beaeb5e9ea64c3
parent3f308ae916c5e5f1312dddc179a7ecf219bd7d9c
Merge branch 'MDL-35666-master' of git://github.com/mouneyrac/moodle
lib/adminlib.php
lib/pluginlib.php