Merge "Make it slightly easier for extensions to hook into page protection."

author Tychay <tchay@wikimedia.org>

Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)
author Tychay <tchay@wikimedia.org>
Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)
diff --cc RELEASE-NOTES-1.22
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/ProtectionForm.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	Tychay <tchay@wikimedia.org>
	Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 26 Aug 2013 22:03:18 +0000 (22:03 +0000)
		1	2
RELEASE-NOTES-1.22	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ProtectionForm.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history