Merge "Show ParserOutput warning instead of on the actual page output for ignored...

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

Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)
diff --cc includes/parser/CoreParserFunctions.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 2 Jun 2016 21:23:04 +0000 (21:23 +0000)
		1	2
includes/parser/CoreParserFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history