Merge "Change Title::getInterwiki() in conditions to Title::isExternal()"

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

Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)
diff --cc includes/Linker.php
Simple merge
diff --cc includes/Title.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 2 Jan 2014 23:31:37 +0000 (23:31 +0000)
		1	2
includes/Linker.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history