Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle

Conflicts: lib/db/upgrade.php version.php
2012-08-15 00:41:04 +02:00
parent 267c898bfd 6a2a055edc
commit 76b97631b0
22 changed files with 56 additions and 340 deletions
@@ -533,7 +533,7 @@ class plugin_manager {
            ),

            'tool' => array(
-                'assignmentupgrade', 'bloglevelupgrade', 'capability', 'customlang', 'dbtransfer', 'generator',
+                'assignmentupgrade', 'capability', 'customlang', 'dbtransfer', 'generator',
                'health', 'innodb', 'langimport', 'multilangupgrade', 'phpunit', 'profiling',
                'qeupgradehelper', 'replace', 'spamcleaner', 'timezoneimport', 'unittest',
                'uploaduser', 'unsuproles', 'xmldb'