Merge branch 'master' of gitorious.org:electrum/electrum
authorThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 12:16:11 +0000 (13:16 +0100)
committerThomasV <thomasv@gitorious>
Sun, 4 Dec 2011 12:16:11 +0000 (13:16 +0100)
commit4ba945f8bd962b4b1e2ac5f81a618bf25ea637db
treef728f4efaf44e2e4ed9d989d52508e55084514ac
parent7af9dba9d0bf6587189d900e51216310bf049958
parent7aada899e7db8eaead47fae0a610c57f3471382e
Merge branch 'master' of gitorious.org:electrum/electrum