Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:37:40 +0000 (15:37 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:37:40 +0000 (15:37 -0400)
commit0ccb2c4f6627e1c4360c296d8e7faca57e77b2f1
tree09af404e167a089b4a603cf379c376e60c180f1a
parentdd675e01c482f96f1d403691d8f8fa8773081a9b
parent84560c41c70d05772adae003ff468d94a3a72435
Merge branch 'master' of github.com:bitcoin/bitcoin