Merge "[LanguageConverter] Added some cache code based on the problems in r97512."

author Catrope <roan.kattouw@gmail.com>

Mon, 9 Apr 2012 22:25:23 +0000 (22:25 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 9 Apr 2012 22:25:24 +0000 (22:25 +0000)
author Catrope <roan.kattouw@gmail.com>
Mon, 9 Apr 2012 22:25:23 +0000 (22:25 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Apr 2012 22:25:24 +0000 (22:25 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/Setup.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Mon, 9 Apr 2012 22:25:23 +0000 (22:25 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 9 Apr 2012 22:25:24 +0000 (22:25 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Setup.php	patch \|	diff1 \|	diff2 \|	blob \| history