Merge branch 'master' of git://github.com/spesmilo/electrum
authorslush0 <info@bitcoin.cz>
Fri, 18 Jan 2013 13:10:02 +0000 (13:10 +0000)
committerslush0 <info@bitcoin.cz>
Fri, 18 Jan 2013 13:10:02 +0000 (13:10 +0000)

Trivial merge