Merge "Add hook for custom difference engine (WikEdDiff)"

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

Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/content/ContentHandler.php
Simple merge
diff --cc includes/diff/DifferenceEngine.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 23 Feb 2015 12:32:10 +0000 (12:32 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/content/ContentHandler.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/diff/DifferenceEngine.php	patch \|	diff1 \|	diff2 \|	blob \| history