Merge "(bug 42915) make MovePage aware of whether redirects are supported."

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

Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)
diff --cc includes/content/ContentHandler.php
Simple merge
diff --cc includes/content/WikitextContentHandler.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 3 Jan 2013 01:35:54 +0000 (01:35 +0000)
		1	2
includes/content/ContentHandler.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/content/WikitextContentHandler.php	patch \|	diff1 \|	diff2 \|	blob \| history