Merge "User: Clean up coding style and documentation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Jun 2013 16:57:57 +0000 (16:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Jun 2013 16:57:57 +0000 (16:57 +0000)

Trivial merge