Merge branch 'master' of github.com:laanwj/bitcoin-qt
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jun 2011 20:39:47 +0000 (22:39 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 10 Jun 2011 20:39:47 +0000 (22:39 +0200)
commit4181184acf8afa9e5f1c37396e7c8e5bd583f39a
treefed77af96bfd2edc810849071305e8d9e589c213
parent5b0dc80bf720a78953a07cb9c71e5da8cefe5279
parent725d460e4b2a2d1d5e3786cb184ad87dcff72d2c
Merge branch 'master' of github.com:laanwj/bitcoin-qt