Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Thu, 29 Aug 2013 15:37:09 +0000 (17:37 +0200)
committerthomasv <thomasv@gitorious>
Thu, 29 Aug 2013 15:37:09 +0000 (17:37 +0200)
commit853d32b73d4b829330974146cd2d3caad5e8d04c
tree66fb57c04bfd62265a63d4106cb821dd0c59da69
parent238ed351349eb1a84cba0b4c940c72e5e6cd98c8
parent10c805b3e7766ee4fdd268e0a2c55f0d9d904321
Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9