Merge "Tweaked timestamp kludge logic in recordUpload2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 May 2014 23:34:29 +0000 (23:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 May 2014 23:34:29 +0000 (23:34 +0000)

Trivial merge