Merge "Remove unmatched @param"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 18 Aug 2014 16:00:50 +0000 (16:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 18 Aug 2014 16:00:50 +0000 (16:00 +0000)

Trivial merge