Merge "Let a few unit tests actually be unit tests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Sep 2016 17:40:33 +0000 (17:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Sep 2016 17:40:33 +0000 (17:40 +0000)

Trivial merge