From: Brian Warner <warner@lothar.com>
Date: Tue, 2 Sep 2014 19:59:32 +0000 (-0700)
Subject: Merge branch markberger/712-tahoe-cp-doesnt-copy-dir
X-Git-Tag: allmydata-tahoe-1.10.1a1~154
X-Git-Url: https://git.rkrishnan.org/module-simplejson-index.html?a=commitdiff_plain;h=b88d8b0b3ea345dec3833fdef0a98326c30572f8;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch markberger/712-tahoe-cp-doesnt-copy-dir

Closes ticket:712 (trac).
Closes tahoe-lafs/tahoe-lafs#56 (github PR).
---

b88d8b0b3ea345dec3833fdef0a98326c30572f8