Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 23 Sep 2011 11:42:04 +0000 (13:42 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 23 Sep 2011 11:42:04 +0000 (13:42 +0200)
commit0961c2fc0d0f9d8a0dee46f8e2020ac479d5b997
tree94e89c52d16c031ba12017bfa56d51e5bd9d1b33
parentb8afa21fad0e5d3e61deca9678d852efe8afc499
parentc7eb151ad0ed441d6fd598551059a9bbfb09e99e
Merge branch 'master' of https://github.com/bitcoin/bitcoin
README-original.md
src/main.cpp