Merge "API edit: allow ConfirmEdit to use the merged parse"

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

Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/api/ApiEditPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 10 Dec 2014 20:22:05 +0000 (20:22 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiEditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history