Merge "New hook for readonly editpages"

author Mwalker <mwalker@wikimedia.org>

Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)
author Mwalker <mwalker@wikimedia.org>
Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/EditPage.php
Simple merge
author	Mwalker <mwalker@wikimedia.org>
	Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 15 Apr 2014 18:15:59 +0000 (18:15 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history