Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sun, 6 Jan 2013 00:44:24 +0000 (01:44 +0100)
committerThomasV <thomasv@gitorious>
Sun, 6 Jan 2013 00:44:24 +0000 (01:44 +0100)
commit75247de92f59a1d06c07c4c2ad2fc9b0198e140d
treeb19e73e2fa3c0e78b5f9f9135dfb7994a3413107
parent272b79effeedae24e427e56885a2db8ad5ccf85d
parent4451745387ccbe887dfebfc9d8bf17e1e991ebed
Merge branch 'master' of git://github.com/spesmilo/electrum