Merge "Add an "ArticleDeleteAfterSuccess" hook"

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

Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/page/Article.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 5 Nov 2014 09:47:58 +0000 (09:47 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history