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)

Trivial merge