Merge "Remove various unused variables"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 8 Nov 2015 02:49:04 +0000 (02:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 8 Nov 2015 02:49:04 +0000 (02:49 +0000)

Trivial merge