From: Brian Warner Date: Tue, 31 Mar 2015 18:07:48 +0000 (-0700) Subject: Merge branch 'ftp-2394' X-Git-Tag: allmydata-tahoe-1.10.1a1~49 X-Git-Url: https://git.rkrishnan.org/simplejson/configuration.rst?a=commitdiff_plain;h=d7b763c7950f6c8bb3143d8409f89a3a63ec6dbe;p=tahoe-lafs%2Ftahoe-lafs.git Merge branch 'ftp-2394' closes ticket:2394 --- d7b763c7950f6c8bb3143d8409f89a3a63ec6dbe