From: Daira Hopwood Date: Fri, 15 Jan 2016 19:15:38 +0000 (+0100) Subject: Merge pull request #220 from tahoe-lafs/2669.magic-folder-misc-patches.1 X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=6d4a8bcd7f4af289e95195a2090c95b79a43ef59;p=tahoe-lafs%2Ftahoe-lafs.git Merge pull request #220 from tahoe-lafs/2669.magic-folder-misc-patches.1 This PR is a bunch of miscellaneous patches that are on the Magic Folder branches, but independent of Magic Folder itself. --- 6d4a8bcd7f4af289e95195a2090c95b79a43ef59