Merge branch 'master' of git://github.com/bitcoin/bitcoin
authorJeff Garzik <jeff@garzik.org>
Tue, 6 Sep 2011 20:20:24 +0000 (16:20 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 6 Sep 2011 20:20:24 +0000 (16:20 -0400)
commit0535644b30c150a2603a8b1adc7ac86bacbf3c76
treebc489fea627ac3cfcd1ce6ab2e42bc60fdd17c61
parentcbd959c473bf40757b22c19e6549504d9e5728b1
parentff4bd3977a81f8d7ab311e7aeb5f3ffbd9f7bff7
Merge branch 'master' of git://github.com/bitcoin/bitcoin