Merge "cleanup action=tokens"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 3 Mar 2013 19:38:51 +0000 (19:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 3 Mar 2013 19:38:51 +0000 (19:38 +0000)

Trivial merge