Merge "Deprecate EditFilterMerged hook, final ContentHandler replaced hook"

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

Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)
diff --cc RELEASE-NOTES-1.28
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 15 Oct 2016 06:41:34 +0000 (06:41 +0000)
		1	2
RELEASE-NOTES-1.28	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history