Merge "Remove dead code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 24 Sep 2015 17:52:50 +0000 (17:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 24 Sep 2015 17:52:50 +0000 (17:52 +0000)

Trivial merge