Merge "Use action=tokens for api test tokens"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Aug 2013 20:40:31 +0000 (20:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Aug 2013 20:40:31 +0000 (20:40 +0000)

Trivial merge