Merge "Use wikimedia/utfnormal library, add backwards-compatability layer"

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

Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)
diff --cc composer.json
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/debug/MWDebug.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 31 Mar 2015 00:51:16 +0000 (00:51 +0000)
		1	2
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/debug/MWDebug.php	patch \|	diff1 \|	diff2 \|	blob \| history