Merge "mediawiki.api: Log warning when requesting legacy token types"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Apr 2016 19:51:27 +0000 (19:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Apr 2016 19:51:27 +0000 (19:51 +0000)

Trivial merge