Merge branch 'master' of https://github.com/laanwj/bitcoin-qt
authorCelil <celil.kj@gmail.com>
Fri, 22 Jul 2011 22:44:53 +0000 (15:44 -0700)
committerCelil <celil.kj@gmail.com>
Fri, 22 Jul 2011 22:44:53 +0000 (15:44 -0700)
commit64c991da2a235ae8d6544ed5cce01c24b233b929
tree7e14cc93a34145e30f951a2ff6b5d2750b87ea00
parent29f9e4e4006e626dc72df0f41b89b83f78a3b764
parent7beada58cd24b1e1121d038bbb61436ebc782770
Merge branch 'master' of https://github.com/laanwj/bitcoin-qt