Merge branch 'master' of gitorious.org:electrum/electrum
authorthomasv <thomasv@gitorious>
Wed, 2 May 2012 09:11:41 +0000 (11:11 +0200)
committerthomasv <thomasv@gitorious>
Wed, 2 May 2012 09:11:41 +0000 (11:11 +0200)
commit6c55410820038538626fc5adbc1afa7836131f1a
tree30207cb60be210265292408dffc36cd8ed7db7da
parent6abda697117d578130df92c8883f338be94a16f9
parentb8fa306bd81a4f994037dac1ebf3430429f11b62
Merge branch 'master' of gitorious.org:electrum/electrum
gui_qt.py