Merge "New language variant 'en-x-piglatin' for easier variant testing"

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

Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 14 Jun 2017 23:57:13 +0000 (23:57 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history