Merge "Remove unused local variables, update formatting and documentation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Nov 2013 19:45:01 +0000 (19:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Nov 2013 19:45:01 +0000 (19:45 +0000)

Trivial merge