Merge pull request #220 from tahoe-lafs/2669.magic-folder-misc-patches.1
authorDaira Hopwood <daira@jacaranda.org>
Fri, 15 Jan 2016 19:15:38 +0000 (20:15 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Fri, 15 Jan 2016 19:15:38 +0000 (20:15 +0100)
commit6d4a8bcd7f4af289e95195a2090c95b79a43ef59
tree11a8e3eac19de12e15dde23d86d1cbf1f91e1e7e
parent41cf60082033b6284b7da4b2ed9cede52ff0620b
parentf2824459ebe604d4f99295651c086d282fa1f37b
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.