Merge branch '2329-2': fix "tahoe cp -r" exception
authorBrian Warner <warner@lothar.com>
Tue, 17 Mar 2015 18:53:30 +0000 (11:53 -0700)
committerBrian Warner <warner@lothar.com>
Tue, 17 Mar 2015 18:53:30 +0000 (11:53 -0700)

Trivial merge