Merge "Avoid page_touched update for HTTP GET action=purge requests"

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

Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)
diff --cc includes/page/Article.php
Simple merge
diff --cc includes/page/WikiPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 13 Sep 2016 06:40:52 +0000 (06:40 +0000)
		1	2
includes/page/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history