From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 16 Mar 2015 15:10:21 +0000 (+0000)
Subject: Merge "Lower timeout of upload stash -> image scaler requests"
X-Git-Tag: 1.31.0-rc.0~12083
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=093bb2e23e7a984eee9c32be79058c6e6974a740;p=lhc%2Fweb%2Fwiklou.git

Merge "Lower timeout of upload stash -> image scaler requests"
---

093bb2e23e7a984eee9c32be79058c6e6974a740