]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Merge branch '2436.less-scary.3'
authorBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:38:09 +0000 (17:38 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 29 Jul 2015 00:38:09 +0000 (17:38 -0700)
This reverts and improves the earlier fix for ticket:2436


Trivial merge