Merge branch 'master' of ssh://amethyst/home/orion/projects2/bitcoin/bitcoin-qt
authorWladimir J. van der Laan <laanwj@gmail.com>
Sun, 5 Jun 2011 14:11:44 +0000 (16:11 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sun, 5 Jun 2011 14:11:44 +0000 (16:11 +0200)
commit9e0576587b91e67aaad3bd4b61571c3fdeeceda7
tree1603e384aa2ea58d943b995c7db27a039db20635
parenta4b4cc290c4f75783014eb454f9862ddaf6edbf1
parent467c31ea0a76860f0c3357670c8525f2d950e8d6
Merge branch 'master' of ssh://amethyst/home/orion/projects2/bitcoin/bitcoin-qt