Merge branch 'master' of https://github.com/laanwj/bitcoin-qt
authorCelil <celil.kj@gmail.com>
Mon, 18 Jul 2011 22:45:55 +0000 (15:45 -0700)
committerCelil <celil.kj@gmail.com>
Mon, 18 Jul 2011 22:45:55 +0000 (15:45 -0700)
commit29f9e4e4006e626dc72df0f41b89b83f78a3b764
tree6ed30c7666af3969ff325f2271d3d3d26c70bdbd
parent97f908e483d06796a1b9c8ce34de304fcc36c31f
parent174b3eddc05f26abbc97a83027a4da9ba4114d57
Merge branch 'master' of https://github.com/laanwj/bitcoin-qt
bitcoin-qt.pro