From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 12 Oct 2015 02:48:20 +0000 (+0100)
Subject: Merge pull request #194 from meejah/2520.magic-folder-smoketest.0
X-Git-Url: https://git.rkrishnan.org/simplejson/%3C?a=commitdiff_plain;h=d5ff0b250956a50462d33372b67365d4146d9aef;p=tahoe-lafs%2Ftahoe-lafs.git

Merge pull request #194 from meejah/2520.magic-folder-smoketest.0

magic-folder smoketest. closes ticket:2520
---

d5ff0b250956a50462d33372b67365d4146d9aef