Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Sun, 9 Oct 2011 18:26:40 +0000 (20:26 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sun, 9 Oct 2011 18:26:40 +0000 (20:26 +0200)
commit8828da5f56313855e19f463ff1c09196812b997b
treee54e27b1a7d5287bbe245189c3044cc1a19ba02b
parentba2db7262bec34d45c75c6842c3a1c0cfaba893e
parent4db9705dd839cbb386398b1eb4be2a67357c27c4
Merge branch 'master' of https://github.com/bitcoin/bitcoin
bitcoin-qt.pro