Merge "Pass user to FileRepo::getUploadStash"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 31 Jan 2015 21:01:24 +0000 (21:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 31 Jan 2015 21:01:24 +0000 (21:01 +0000)

Trivial merge