Merge "Fix UploadStash::removeFile() error"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Feb 2013 00:04:21 +0000 (00:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Feb 2013 00:04:21 +0000 (00:04 +0000)

Trivial merge