From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 10 Feb 2015 18:28:09 +0000 (+0000)
Subject: Merge pull request #142 from tahoe-lafs/754.location-AUTO.2
X-Git-Tag: allmydata-tahoe-1.10.1a1~70
X-Git-Url: https://git.rkrishnan.org/frontends/components?a=commitdiff_plain;h=2d9af506f1d315016d0d63d6a7491ecd2a370448;p=tahoe-lafs%2Ftahoe-lafs.git

Merge pull request #142 from tahoe-lafs/754.location-AUTO.2

Allow combining autodetected and statically configured locations
---

2d9af506f1d315016d0d63d6a7491ecd2a370448