Merge "Lower timeout of upload stash -> image scaler requests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 16 Mar 2015 15:10:21 +0000 (15:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 16 Mar 2015 15:10:21 +0000 (15:10 +0000)

Trivial merge