Merge branch '1.9' of git://github.com/spesmilo/electrum into 1.9
authorthomasv <thomasv@gitorious>
Mon, 2 Sep 2013 09:16:35 +0000 (11:16 +0200)
committerthomasv <thomasv@gitorious>
Mon, 2 Sep 2013 09:16:35 +0000 (11:16 +0200)
1  2 
lib/interface.py

Simple merge