Merge "fix spurious failure of TimestampTest" into Wikidata
authordaniel <daniel.kinzler@wikimedia.de>
Wed, 5 Sep 2012 19:14:45 +0000 (19:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 5 Sep 2012 19:14:45 +0000 (19:14 +0000)

Trivial merge