From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 30 Dec 2015 00:16:39 +0000 (+0000)
Subject: Merge "Split classes in Import.php into separate files"
X-Git-Tag: 1.31.0-rc.0~8522
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=6a325346460c6de5b8edf315117cab92fc51b11b;p=lhc%2Fweb%2Fwiklou.git

Merge "Split classes in Import.php into separate files"
---

6a325346460c6de5b8edf315117cab92fc51b11b
diff --cc autoload.php
index 3fa5896334,75466f52ae..ac38fa5586
--- a/autoload.php
+++ b/autoload.php
@@@ -1387,9 -1386,9 +1387,9 @@@ $wgAutoloadLocalClasses = array
  	'WebResponse' => __DIR__ . '/includes/WebResponse.php',
  	'WikiCategoryPage' => __DIR__ . '/includes/page/WikiCategoryPage.php',
  	'WikiDiff3' => __DIR__ . '/includes/diff/WikiDiff3.php',
 -	'WikiExporter' => __DIR__ . '/includes/Export.php',
 +	'WikiExporter' => __DIR__ . '/includes/export/WikiExporter.php',
  	'WikiFilePage' => __DIR__ . '/includes/page/WikiFilePage.php',
- 	'WikiImporter' => __DIR__ . '/includes/Import.php',
+ 	'WikiImporter' => __DIR__ . '/includes/import/WikiImporter.php',
  	'WikiMap' => __DIR__ . '/includes/WikiMap.php',
  	'WikiPage' => __DIR__ . '/includes/page/WikiPage.php',
  	'WikiReference' => __DIR__ . '/includes/WikiMap.php',