Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:31:32 +0000 (15:31 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Mar 2012 19:31:32 +0000 (15:31 -0400)
commitc698633447b95cd69113676a5cc4d554ba408e14
treeba40fa7775e7d5cbc4042b0c8d743dfa34554bab
parentbf5b80a8ae67b177e06c7024eb3b7a14097a8814
parentc289d95d6bb3105a67b96a697ddb9dd773cf1033
Merge branch 'master' of github.com:bitcoin/bitcoin
src/db.h