From: Forrest Voight <forrest@forre.st>
Date: Mon, 15 Oct 2012 06:35:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into tx_preforwarding
X-Git-Tag: 8.0^2~2
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=414e981a3859c911f459027fa7869bcd8666469a

Merge remote-tracking branch 'origin/master' into tx_preforwarding
---

414e981a3859c911f459027fa7869bcd8666469a