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)
This PR is a bunch of miscellaneous patches that are on the Magic Folder branches, but independent of Magic Folder itself.


Trivial merge