Merge branch 'master' of https://github.com/smola/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Wed, 23 Mar 2011 22:21:22 +0000 (18:21 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 23 Mar 2011 22:21:22 +0000 (18:21 -0400)
commit0b8e4738f90dc6e6c67b6e6cae20174a4f9c7e08
tree484bcd3a671fa598f26618190c3afbed7ca201f2
parentd38e683a6f6152e8f0289a9f0d02d528d55bc0a1
parentf30dabb2ace0e08f75cc2985556dff71587b7b95
Merge branch 'master' of https://github.com/smola/bitcoin into tmp