Merge "Allow to pass a rev id to a log entry without making it unpatrolled"

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

Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)
diff --cc includes/changes/RecentChange.php
Simple merge
diff --cc includes/filerepo/file/LocalFile.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 7 Apr 2016 08:47:03 +0000 (08:47 +0000)
		1	2
includes/changes/RecentChange.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filerepo/file/LocalFile.php	patch \|	diff1 \|	diff2 \|	blob \| history