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)
Allow combining autodetected and statically configured locations


Trivial merge