From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 27 Nov 2014 16:38:57 +0000 (+0000)
Subject: Merge branch 'master' of github.com:tahoe-lafs/tahoe-lafs into 195-windows-packaging-4
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/copyable.html?a=commitdiff_plain;h=de9be12427c0f27ea0c3aed4c69aca52cc35c204;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch 'master' of github.com:tahoe-lafs/tahoe-lafs into 195-windows-packaging-4
---

de9be12427c0f27ea0c3aed4c69aca52cc35c204