Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Tue, 27 Aug 2013 11:59:20 +0000 (13:59 +0200)
committerthomasv <thomasv@gitorious>
Tue, 27 Aug 2013 11:59:20 +0000 (13:59 +0200)
commit238ed351349eb1a84cba0b4c940c72e5e6cd98c8
treef61b4cc1289a2955afd9901096b6ea3b1ac94472
parentf4c26dfac0a8b518aeee4adb5215971b72209c39
parent084ed6776b9bddae13bbab788b855b450ca9b55e
Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9