Merge "Add dotall modifier to EDITSECTION_REGEX"

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

Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)
diff --cc includes/parser/ParserOutput.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 18 Dec 2016 02:53:47 +0000 (02:53 +0000)
		1	2
includes/parser/ParserOutput.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history