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

Trivial merge