Merge "Revert "Remove invalid language code "bh" (alias of "bho")""

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

Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)
diff --cc RELEASE-NOTES-1.26
Simple merge
diff --cc languages/Names.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 19 May 2015 06:03:35 +0000 (06:03 +0000)
		1	2
RELEASE-NOTES-1.26	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Names.php	patch \|	diff1 \|	diff2 \|	blob \| history