Merge branch tarcieri/redesigned-directory-page
authorBrian Warner <warner@lothar.com>
Tue, 2 Sep 2014 21:01:24 +0000 (14:01 -0700)
committerBrian Warner <warner@lothar.com>
Tue, 2 Sep 2014 21:01:24 +0000 (14:01 -0700)
commitc4da6c91a79794d2af2a7b36a07785a823d70a46
tree03274875e5f4e9645375f93eb6ea74bc9fa8452b
parent7015f21e5a359ce55db3b4e81cbbb556b5759386
parentd7aef0cffb2a28465f75c883128e99045dadcb82
Merge branch tarcieri/redesigned-directory-page

Closes ticket:1966 (trac)
Closes tahoe-lafs/tahoe-lafs#32 (github PR)