Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 22:20:51 +0000 (11:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 22:20:51 +0000 (11:20 +1300)
1  2 
filter/manage.php
lib/moodlelib.php
lib/tests/component_test.php
lib/upgrade.txt

Simple merge
Simple merge
Simple merge
diff --cc lib/upgrade.txt
Simple merge