From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 26 Oct 2015 07:14:54 +0000 (+0000)
Subject: Merge "In UploadStash, prioritize core metadata over file handler metadata"
X-Git-Tag: 1.31.0-rc.0~9247
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=160a7ed930673506ff2207885f9cbd5907c93c85;p=lhc%2Fweb%2Fwiklou.git

Merge "In UploadStash, prioritize core metadata over file handler metadata"
---

160a7ed930673506ff2207885f9cbd5907c93c85