Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 28 Sep 2011 19:52:32 +0000 (21:52 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 28 Sep 2011 19:52:32 +0000 (21:52 +0200)
commit002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0
tree58a16a226571a80537bfa7e3b1147aa4d0ee8767
parenta8b95ce6ed5e84d34748ecdd0ff1db4d03377cf0
parent4dcad1d294e264a81280fd007d1508d9bd4f0273
Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro
bitcoin-qt.pro
src/main.cpp
src/util.h