Merge "Use ForeignFileRepo information for foreign uploads"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)
diff --cc RELEASE-NOTES-1.27
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 7 Oct 2015 16:05:58 +0000 (16:05 +0000)
		1	2
RELEASE-NOTES-1.27	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history