Merge "Hygiene: Use strtr() instead of str_replace() for character swapping"

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

Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc languages/Language.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 15 Jul 2015 09:39:45 +0000 (09:39 +0000)
		1	2
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history