Merge "Cleanup static analysis errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Dec 2016 00:39:16 +0000 (00:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Dec 2016 00:39:16 +0000 (00:39 +0000)

Trivial merge