Merge "Fix-up for I2ac604d3c042d"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jun 2015 05:07:14 +0000 (05:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Jun 2015 05:07:14 +0000 (05:07 +0000)

Trivial merge