Merge branch 'separate_wallets'
authorthomasv <thomasv@gitorious>
Sat, 6 Apr 2013 19:12:28 +0000 (21:12 +0200)
committerthomasv <thomasv@gitorious>
Sat, 6 Apr 2013 19:12:28 +0000 (21:12 +0200)
1  2 
gui/gui_classic.py

Simple merge