Merge "fix line length warnings from Jenkins"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 17 Jan 2017 21:02:07 +0000 (21:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 Jan 2017 21:02:08 +0000 (21:02 +0000)

Trivial merge