Merge branch 'master' of github.com:laanwj/bitcoin-qt
authorWladimir J. van der Laan <laanwj@gmail.com>
Sat, 3 Sep 2011 18:51:48 +0000 (20:51 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sat, 3 Sep 2011 18:51:48 +0000 (20:51 +0200)
commit69e87633bca0e43f3a58dad921a6fb1bdecd307b
tree6f51d42592e74ba6cc2469960f3eee3b3a499b17
parent0a70a3f4d88ad8e4ab689bacff4eda0cdfa88e65
parent4785e6df74151f91d0c1a90cf65674eb9fed4ab7
Merge branch 'master' of github.com:laanwj/bitcoin-qt