From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 24 Apr 2014 22:17:51 +0000 (+0000)
Subject: Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"
X-Git-Tag: 1.31.0-rc.0~16016
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=7b8af70f26c0ac6a3867a48afbf44815ef1f0636;p=lhc%2Fweb%2Fwiklou.git

Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"
---

7b8af70f26c0ac6a3867a48afbf44815ef1f0636