From: Brian Warner <warner@lothar.com>
Date: Wed, 2 Jul 2014 20:11:28 +0000 (-0700)
Subject: Merge branch 'pr6'
X-Git-Tag: allmydata-tahoe-1.10.1a1~177
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson/something?a=commitdiff_plain;h=e61632909cd1fb84402eebd932aba14f0062d54b;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch 'pr6'
---

e61632909cd1fb84402eebd932aba14f0062d54b