Merge "Add Uncyclopedia to the default interwiki list."

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

Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)
diff --cc maintenance/interwiki.list
Simple merge
diff --cc maintenance/interwiki.sql
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 8 Aug 2014 21:38:39 +0000 (21:38 +0000)
		1	2
maintenance/interwiki.list	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/interwiki.sql	patch \|	diff1 \|	diff2 \|	blob \| history