Merge "Proper namespace handling for WikiImporter"

diff --cc autoload.php
Simple merge

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/Import.php
index daefb88,5922c69..c3caecc
--- 1/includes/Import.php
--- 2/includes/Import.php
+++ b/includes/Import.php
@@@ -326,9 -347,10 +347,10 @@@ class WikiImporter 
         * @param array $pageInfo
         * @return bool
         */
-       public function finishImportPage( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) {
+       public function finishImportPage( $title, $foreignTitle, $revCount,
+                       $sRevCount, $pageInfo ) {
                $args = func_get_args();
 -              return wfRunHooks( 'AfterImportPage', $args );
 +              return Hooks::run( 'AfterImportPage', $args );
        }
  
        /**

diff --cc includes/specials/SpecialImport.php
Simple merge