From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 4 Dec 2015 18:01:30 +0000 (+0000)
Subject: Merge pull request #204 from leif/preferred_peers-rebased3
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=b5222e36798086567efca6b0b436976c6b8598fe;p=tahoe-lafs%2Ftahoe-lafs.git

Merge pull request #204 from leif/preferred_peers-rebased3

new feature: preferred storage servers
---

b5222e36798086567efca6b0b436976c6b8598fe