Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Wed, 1 May 2013 09:26:59 +0000 (11:26 +0200)
committerecdsa <ecdsa@github>
Wed, 1 May 2013 09:26:59 +0000 (11:26 +0200)
commit4ab44019fd9253663dec30829aacda05565c87c3
treefe0c22608850e3bfee0ee7f512c91ecc719056bb
parent97e849a248c6415e1032090ebb01b999c6fff1d4
parente2c4d61121cee157d1491d556650902d4ed7791f
Merge branch 'master' of git://github.com/spesmilo/electrum