Merge branch 'master' into feature/raw_tx
authorMaran <maran.hidskes@gmail.com>
Thu, 7 Mar 2013 15:49:11 +0000 (16:49 +0100)
committerMaran <maran.hidskes@gmail.com>
Thu, 7 Mar 2013 15:49:11 +0000 (16:49 +0100)
commit0504f3b3ca451f0b173fe8ae280254bfe17db390
treec4e8e7a43cd8128f837377453a1281474e1015de
parent5610d654d9acd721160c97c41372a61c2f9b074d
parent3382354442c2a9729301dadd8070ed563b2b5b54
Merge branch 'master' into feature/raw_tx
gui/gui_classic.py