Merge branch 'testnetirc' of https://github.com/sipa/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:26:19 +0000 (11:26 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:26:19 +0000 (11:26 -0500)
commit5c032825219a78756599fe638d8740961ff8f66e
treea6202b36cf0589786520476f747aad9cecff60be
parent6fe8c45375f883813e646175d557ccbbf5b9926d
parent92d5864b80ac6b1d382c1576c0e21f8330aa6816
Merge branch 'testnetirc' of https://github.com/sipa/bitcoin