Merge pull request #142 from tahoe-lafs/754.location-AUTO.2
authorDaira Hopwood <daira@jacaranda.org>
Tue, 10 Feb 2015 18:28:09 +0000 (18:28 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 10 Feb 2015 18:28:09 +0000 (18:28 +0000)
commit2d9af506f1d315016d0d63d6a7491ecd2a370448
treed07e7281bdf126997ed1dbfa3336b43ba8dfd72d
parentce7a867b22ede846f215e5977e16aef8caa8c197
parent1b83f7854c473ffe5d7b6d687e4eaada21f55893
Merge pull request #142 from tahoe-lafs/754.location-AUTO.2

Allow combining autodetected and statically configured locations