Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master
authortcatm <tcatm@gawab.com>
Tue, 22 Feb 2011 02:00:09 +0000 (03:00 +0100)
committertcatm <tcatm@gawab.com>
Tue, 22 Feb 2011 02:00:09 +0000 (03:00 +0100)
commit6696beed4502fe4e4c8a8d4801cbc4c9007239d9
treeeae2937d6b394f79048d8c0264d242e593a421a9
parentd787e00a3bb47c513566a8f9baef5b6b3c6d93b4
parentb1ca5eb58ac322a1a14f5f8479502a735d128443
Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master