Merge "Timing: Fix flaky TimingTest test"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Feb 2016 21:18:23 +0000 (21:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Feb 2016 21:18:23 +0000 (21:18 +0000)

Trivial merge