From: Daira Hopwood Date: Thu, 28 May 2015 20:36:21 +0000 (+0100) Subject: Merge pull request #171 from david415/2418.remote-to-local-sync.2 X-Git-Url: https://git.rkrishnan.org/simplejson/-?a=commitdiff_plain;h=90f2922fcd98fc5be7a8868901659f03db89fa7f;p=tahoe-lafs%2Ftahoe-lafs.git Merge pull request #171 from david415/2418.remote-to-local-sync.2 Fix markup --- 90f2922fcd98fc5be7a8868901659f03db89fa7f