Merge "API: Allow fetching login token from action=query&meta=tokens on private wikis"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Mar 2016 22:19:25 +0000 (22:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Mar 2016 22:19:25 +0000 (22:19 +0000)

Trivial merge