Merge "Add 皮膚 for better word segmentation."

author Siebrand <siebrand@wikimedia.org>

Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)
author Siebrand <siebrand@wikimedia.org>
Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)
diff --cc includes/ZhConversion.php
Simple merge
diff --cc includes/zhtable/tradphrases.manual
Simple merge
author	Siebrand <siebrand@wikimedia.org>
	Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 26 Jul 2012 04:38:52 +0000 (04:38 +0000)
		1	2
includes/ZhConversion.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/zhtable/tradphrases.manual	patch \|	diff1 \|	diff2 \|	blob \| history