Merge "MediaWiki\Auth\Throttler: Change "ip" key name"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 May 2018 22:38:39 +0000 (22:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 May 2018 22:38:39 +0000 (22:38 +0000)

Trivial merge