Merge "Revert "mediawiki.api: Use action=query&meta=tokens instead of action=tokens""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 25 Nov 2014 16:23:14 +0000 (16:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Nov 2014 16:23:14 +0000 (16:23 +0000)

Trivial merge