tMerge branch 'master' of https://github.com/Spesmilo/Electrum - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit 840b51be4ec8902c1bb12434a77ce6f4a5ac2571
 (DIR) parent 4c2135f58d053f5cb25138eb6d753f05ccee7187
 (HTM) Author: Maran <maran.hidskes@gmail.com>
       Date:   Thu,  2 Aug 2012 22:41:46 +0200
       
       Merge branch 'master' of https://github.com/Spesmilo/Electrum
       
       Diffstat:
         A .gitignore                          |       8 ++++++++
         A TODO                                |      14 ++++++++++++++
         M data/style.css                      |       1 -
       
       3 files changed, 22 insertions(+), 1 deletion(-)
       ---
 (DIR) diff --git a/.gitignore b/.gitignore
       t@@ -0,0 +1,7 @@
       +####-*.patch
       +lib/icons_rc.py
       +*.pyc
       +build/
       +dist/
       +*.egg/
       +/electrum.py
       +\ No newline at end of file
 (DIR) diff --git a/TODO b/TODO
       t@@ -0,0 +1,14 @@
       +Client:
       +
       +- Wizard
       +- Multiple wallets
       +- Themes
       +- Extend GUI with history view (View -> Show History)
       +- Settings window
       +
       +Server:
       +
       +- Reimplementation using libbitcoin
       +- New blockchain backend or disable bdb ACID
       +- Electrum deterministic wallet impl for Spinner style protocol.
       +
 (DIR) diff --git a/data/style.css b/data/style.css
       t@@ -42,7 +42,6 @@ MiniWindow QPushButton {
            border-radius: 4px;
            border: 1px solid #AAA9A9;
            width: 225px;
       -    margin-top: 4px;
        }
        
        #address_input[isValid=true]