Merge "(Bug 38439) Attempt on fixing the suicidal LangObjCache"

author Siebrand <siebrand@wikimedia.org>

Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)
author Siebrand <siebrand@wikimedia.org>
Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc languages/Language.php
Simple merge
author	Siebrand <siebrand@wikimedia.org>
	Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 9 Dec 2012 23:42:34 +0000 (23:42 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history