From: David Stainton Date: Wed, 24 Jun 2015 19:52:58 +0000 (-0700) Subject: Merge branch '2454.magic-folder-create-tool.2' into 1710.local-deletion-water-dragon.1 X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/class-simplejson.JSONEncoder.html?a=commitdiff_plain;h=13cb2a13f3fc373c0d3888d6ff254cc819fbc468;p=tahoe-lafs%2Ftahoe-lafs.git Merge branch '2454.magic-folder-create-tool.2' into 1710.local-deletion-water-dragon.1 --- 13cb2a13f3fc373c0d3888d6ff254cc819fbc468