Merge "mw.Api: Replace deprecated token names by 'csrf'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Apr 2016 20:51:08 +0000 (20:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Apr 2016 20:51:08 +0000 (20:51 +0000)

Trivial merge