Merge "SECURITY: Throttle uploads"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 16 Oct 2015 21:09:32 +0000 (21:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 16 Oct 2015 21:09:32 +0000 (21:09 +0000)

Trivial merge