Merge "Made getName() in ArchivedFile work when loaded via sha1"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 May 2014 18:52:59 +0000 (18:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 May 2014 18:52:59 +0000 (18:52 +0000)

Trivial merge