Merge branch 'master' of github.com:spesmilo/electrum
authorslush <info@bitcoin.cz>
Sun, 9 Dec 2012 23:51:07 +0000 (00:51 +0100)
committerslush <info@bitcoin.cz>
Sun, 9 Dec 2012 23:51:07 +0000 (00:51 +0100)
commit35838b088497d2e8a1d52d10d5fe70724188088d
treeb4ecb17859faec8492e57874a2568c829756ca2a
parent837e154d3928c0d96e2e50ef4425201c863a59db
parent639471239249ee9f9840b4c6489628d2ca1e2433
Merge branch 'master' of github.com:spesmilo/electrum