tMerge pull request #859 from PabloCastellano/master - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit 6c6293c777a0256a32f12e4665545e11167386bb
 (DIR) parent 10aba39d4e11b595776794f32ef13af5c13e5069
 (HTM) Author: ThomasV <thomasv1@gmx.de>
       Date:   Sun, 21 Sep 2014 19:24:15 +0200
       
       Merge pull request #859 from PabloCastellano/master
       
       setup.py: Install qrscanner (it's a library now)
       Diffstat:
         M setup.py                            |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
 (DIR) diff --git a/setup.py b/setup.py
       t@@ -95,6 +95,7 @@ setup(
                'electrum.paymentrequest',
                'electrum.paymentrequest_pb2',
                'electrum.plugins',
       +        'electrum.qrscanner',
                'electrum.simple_config',
                'electrum.synchronizer',
                'electrum.transaction',