Merge "reinstating Change Ifb1f6125..."

author Kaldari <rkaldari@wikimedia.org>

Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
author Kaldari <rkaldari@wikimedia.org>
Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/specials/SpecialUpload.php
Simple merge
author	Kaldari <rkaldari@wikimedia.org>
	Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUpload.php	patch \|	diff1 \|	diff2 \|	blob \| history