From: David Stainton <dstainton415@gmail.com>
Date: Tue, 19 May 2015 22:08:25 +0000 (-0700)
Subject: Merge branch '2418.remote-to-local-sync.1' of github.com:tahoe-lafs/tahoe-lafs into... 
X-Git-Url: https://git.rkrishnan.org/%5B%5E?a=commitdiff_plain;h=b0f28d7cde87b03e91c82acba2127e29347c9aac;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch '2418.remote-to-local-sync.1' of github.com:tahoe-lafs/tahoe-lafs into 2418.remote-to-local-sync.1
---

b0f28d7cde87b03e91c82acba2127e29347c9aac