Merge "RemexHtml tidy driver with p-wrapping"

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

Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)
diff --cc autoload.php
Simple merge
diff --cc composer.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 8 Mar 2017 15:24:36 +0000 (15:24 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history