Merge "Remove some unused variables"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 22 Feb 2016 17:03:23 +0000 (17:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 22 Feb 2016 17:03:23 +0000 (17:03 +0000)

Trivial merge