Merge "Avoid contention in updateLinksTimestamp()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Jun 2016 23:39:19 +0000 (23:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Jun 2016 23:39:19 +0000 (23:39 +0000)

Trivial merge