Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 7 Sep 2011 16:57:11 +0000 (18:57 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 7 Sep 2011 16:57:11 +0000 (18:57 +0200)
commita0d2f9a12dad7b33a3f12d85dee8afa4155dbc99
tree24a475fe47ed00837fbed1836d03d933cfe7dbb2
parentf077d1ad62cba26b2620c87abba87be7fec15f0d
parentf92f022edaa2f14951b9ce8304a304ff9693ae16
Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
.gitignore
.gitignore
README-original.md
src/main.cpp