Merge "Add expensive parser functions {{REVISION*:}}"

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

Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)
diff --cc RELEASE-NOTES-1.23
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 4 Nov 2013 23:21:46 +0000 (23:21 +0000)
		1	2
RELEASE-NOTES-1.23	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Parser.php	patch \|	diff1 \|	diff2 \|	blob \| history