Merge "Break up $wgDummyLanguageCodes"

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

Wed, 8 Mar 2017 20:46:46 +0000 (20:46 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 8 Mar 2017 20:46:47 +0000 (20:46 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Mar 2017 20:46:46 +0000 (20:46 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Mar 2017 20:46:47 +0000 (20:46 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Setup.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 8 Mar 2017 20:46:46 +0000 (20:46 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 8 Mar 2017 20:46:47 +0000 (20:46 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Setup.php	patch \|	diff1 \|	diff2 \|	blob \| history