Merge pull request #204 from leif/preferred_peers-rebased3
authorDaira Hopwood <daira@jacaranda.org>
Fri, 4 Dec 2015 18:01:30 +0000 (18:01 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Fri, 4 Dec 2015 18:01:30 +0000 (18:01 +0000)
new feature: preferred storage servers


Trivial merge