Merge "Add checks to try to catch T92046"

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

Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)
diff --cc includes/Revision.php
Simple merge
diff --cc includes/page/WikiPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 2 Apr 2015 23:41:06 +0000 (23:41 +0000)
		1	2
includes/Revision.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history