From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 16 Jul 2014 18:34:11 +0000 (+0000)
Subject: Merge "In AutoLoader, move LC and UserCache to includes/cache section"
X-Git-Tag: 1.31.0-rc.0~14921
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=f8de918277e34656de5dc4f78a2a0d90b63ffec1;p=lhc%2Fweb%2Fwiklou.git

Merge "In AutoLoader, move LC and UserCache to includes/cache section"
---

f8de918277e34656de5dc4f78a2a0d90b63ffec1
diff --cc includes/AutoLoader.php
index a58639dadc,b0c474ea42..016886b12e
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -357,9 -357,9 +356,10 @@@ $wgAutoloadLocalClasses = array
  	'MessageCache' => 'includes/cache/MessageCache.php',
  	'ObjectFileCache' => 'includes/cache/ObjectFileCache.php',
  	'ResourceFileCache' => 'includes/cache/ResourceFileCache.php',
+ 	'UserCache' => 'includes/cache/UserCache.php',
  
  	# includes/changes
 +	'ChangesFeed' => 'includes/changes/ChangesFeed.php',
  	'ChangesList' => 'includes/changes/ChangesList.php',
  	'EnhancedChangesList' => 'includes/changes/EnhancedChangesList.php',
  	'OldChangesList' => 'includes/changes/OldChangesList.php',