Merge "Made User::newTouchedTimestamp handle clock skew a bit better"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 Apr 2015 18:47:48 +0000 (18:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 Apr 2015 18:47:48 +0000 (18:47 +0000)

Trivial merge