Merge "ApiUpload: Better handle unreasonably large metadata in 'imageinfo'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Aug 2016 17:02:32 +0000 (17:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Aug 2016 17:02:32 +0000 (17:02 +0000)

Trivial merge