From: Brian Warner Date: Tue, 17 Mar 2015 18:53:30 +0000 (-0700) Subject: Merge branch '2329-2': fix "tahoe cp -r" exception X-Git-Tag: allmydata-tahoe-1.10.1a1~60 X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/class-simplejson.JSONDecoder.html?a=commitdiff_plain;h=e60392a4794e59a275ac572fb00f9e40bc81a631;p=tahoe-lafs%2Ftahoe-lafs.git Merge branch '2329-2': fix "tahoe cp -r" exception --- e60392a4794e59a275ac572fb00f9e40bc81a631