Merge "Fix errors in UIDGeneratorTest::testTimestampedUID"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Nov 2014 02:34:57 +0000 (02:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Nov 2014 02:34:57 +0000 (02:34 +0000)

Trivial merge