Merge "SECURITY: Don't parse usernames as wikitext"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 29 May 2014 17:33:43 +0000 (17:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 29 May 2014 17:33:43 +0000 (17:33 +0000)

Trivial merge