From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 15 May 2012 01:07:05 +0000 (+0000)
Subject: Merge "Implemented a wrapper for the memcached PECL client"
X-Git-Tag: 1.31.0-rc.0~23612
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=ba7a5f70f40eaba6b7a7d343da200e1f0fb776b7;p=lhc%2Fweb%2Fwiklou.git

Merge "Implemented a wrapper for the memcached PECL client"
---

ba7a5f70f40eaba6b7a7d343da200e1f0fb776b7
diff --cc includes/AutoLoader.php
index 25e90d1f90,30a18bb089..de31736aa5
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -56,9 -56,7 +56,8 @@@ $wgAutoloadLocalClasses = array
  	'DeferredUpdates' => 'includes/DeferredUpdates.php',
  	'DeprecatedGlobal' => 'includes/DeprecatedGlobal.php',
  	'DerivativeRequest' => 'includes/WebRequest.php',
 +	'DeviceDetection' => 'includes/DeviceDetection.php',
  	'DiffHistoryBlob' => 'includes/HistoryBlob.php',
- 
  	'DoubleReplacer' => 'includes/StringUtils.php',
  	'DummyLinker' => 'includes/Linker.php',
  	'Dump7ZipOutput' => 'includes/Export.php',