Merge "Silence warnings about deprecation by ContentHandler."

author Aaron Schulz <aschulz@wikimedia.org>

Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 13 Oct 2012 00:03:31 +0000 (00:03 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history