tMerge branch 'master' of 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 599c13806576d12b3a8dedd46ab2f3d6c0ae40f8
 (DIR) parent f715caa27d5a1d934ec2c1f2115f4b43c2c8970e
 (HTM) Author: ThomasV <thomasv@electrum.org>
       Date:   Wed, 29 Nov 2017 19:04:32 +0100
       
       Merge branch 'master' of github.com:spesmilo/electrum
       
       Diffstat:
         M electrum-env                        |       2 +-
       
       1 file changed, 1 insertion(+), 1 deletion(-)
       ---
 (DIR) diff --git a/electrum-env b/electrum-env
       t@@ -12,7 +12,7 @@
        if [ -e ./env/bin/activate ]; then
            source ./env/bin/activate
        else
       -    virtualenv env
       +    virtualenv env -p `which python3`
            source ./env/bin/activate
            python3 setup.py install
        fi