Merge "store text length in local var in Preprocess::processToObj/Xml"

author Aaron Schulz <aschulz@wikimedia.org>

Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)
diff --cc includes/parser/Preprocessor_Hash.php
Simple merge
diff --cc includes/parser/Preprocessor_HipHop.hphp
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 15 Aug 2012 00:22:10 +0000 (00:22 +0000)
		1	2
includes/parser/Preprocessor_Hash.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Preprocessor_HipHop.hphp	patch \|	diff1 \|	diff2 \|	blob \| history