Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:34:13 +0000 (15:34 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:34:13 +0000 (15:34 -0400)
commitdd675e01c482f96f1d403691d8f8fa8773081a9b
tree09af404e167a089b4a603cf379c376e60c180f1a
parentc698633447b95cd69113676a5cc4d554ba408e14
parentbe4502968e18a121331c0fd90cffc4580ff024f3
Merge branch 'master' of github.com:bitcoin/bitcoin