Merge branch 'master' of https://github.com/devrandom/bitcoin into tmp
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Mar 2011 17:58:49 +0000 (12:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 10 Mar 2011 17:58:49 +0000 (12:58 -0500)
commit12e091842f9ae3b2f2e995b96d10f932b31ef52d
tree9271b0297033c747bdf95e44317be1828d0bdc37
parent81d3b1c825f9e4bfafd09a001e72bd94f8c84075
parent0d0bd331aea5bb3143c668f05810bc0147e6f9e8
Merge branch 'master' of https://github.com/devrandom/bitcoin into tmp