Merge "phpunit: Make LogFormatterTest less slow"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 15 Apr 2017 02:11:02 +0000 (02:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 15 Apr 2017 02:11:02 +0000 (02:11 +0000)

Trivial merge