From: David Stainton Date: Thu, 29 Oct 2015 08:59:37 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/2438.magic-folder-stable.5' into 2551.remote... X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/module-simplejson.scanner.html?a=commitdiff_plain;h=b0dd570c5130569ffd8b24ee17253e26ba71aee7;p=tahoe-lafs%2Ftahoe-lafs.git Merge remote-tracking branch 'upstream/2438.magic-folder-stable.5' into 2551.remote-conflict-detection.3 --- b0dd570c5130569ffd8b24ee17253e26ba71aee7