Merge branch 'file_pruned_revamp'
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 22:18:39 +0000 (18:18 -0400)
commit64946f91982d85bb301cc9241459939c657d0eb9
treeb61b844a4b8ec9977ce267a911bc1e8406a0dab0
parent9fc13ab196f9ac9852962365d3330020d6720b0b
parent511f7f9cb94ebdd8ea33973a0ca74d2f8249aa3f
Merge branch 'file_pruned_revamp'