From: Brian Warner <warner@lothar.com>
Date: Wed, 23 Sep 2015 04:30:03 +0000 (-0700)
Subject: Merge branch '2510-new-foolscap'
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/?a=commitdiff_plain;h=1ffc6534bd516bfabab827dd5ed9636649d7b053;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch '2510-new-foolscap'
---

1ffc6534bd516bfabab827dd5ed9636649d7b053