Merge branch 'master' of git://github.com/bitcoin/bitcoin
authorJeff Garzik <jeff@garzik.org>
Wed, 23 Mar 2011 22:28:50 +0000 (18:28 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 23 Mar 2011 22:28:50 +0000 (18:28 -0400)
commit3a47bf72658bedf103dc75fec69d44f21fc668b5
tree0a28892ca2327673a5d195a65a8676443e78c43c
parent8203ec4b11426b33a7f029c6f3ba3f9e9b9dc4f1
parentc3f140033c531e9c5eae920c16fe2ecc80faa1a2
Merge branch 'master' of git://github.com/bitcoin/bitcoin