Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Wed, 25 Jun 2014 14:46:05 +0000 (16:46 +0200)
committerThomasV <thomasv@gitorious>
Wed, 25 Jun 2014 14:46:05 +0000 (16:46 +0200)
commit05dba32315d7d9ec7a50c7ea3c8d5dcc69462f0d
tree9706158320bfd4e8d7c7722aaf0756d70ef82d71
parent54973062bd903bda787bb94a66bc4eff7b35b77b
parent935286fe1cd597cb32f57ddbb2da34dcaaea8b7f
Merge branch 'master' of git://github.com/spesmilo/electrum