Merge "Remove unused variable and deprecated parameters"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 16 Dec 2013 12:29:01 +0000 (12:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 16 Dec 2013 12:29:01 +0000 (12:29 +0000)

Trivial merge