[Pkg-bitcoin-commits] [electrum] 23/24: Merge tag 'upstream/2.4.4'

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 388e81ed8244de506b04d4f138ccd495dbb5af56
Merge: 5d405b2 d064f57
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Aug 24 00:42:50 2015 +0200

    Merge tag 'upstream/2.4.4'
    
    Upstream version 2.4.4
    
    # gpg: Signature made Mon 24 Aug 2015 00:42:41 SAST
    # gpg:                using RSA key 0x58C0FB1CDE3B7600
    # gpg: Good signature from "Tristan Seligmann <mithrandi at mithrandi.net>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at debian.org>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at keybase.io>" [ultimate]
    # gpg: Signature notation: issuer-fpr at notations.openpgp.fifthhorseman.net=DB24E315EDAAAC13D646709958C0FB1CDE3B7600
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600

 Electrum.egg-info/PKG-INFO          |    2 +-
 Electrum.egg-info/SOURCES.txt       |   42 +-
 PKG-INFO                            |    2 +-
 RELEASE-NOTES                       |    8 +
 docs/Makefile                       |  183 ----
 docs/android.html                   |   60 -
 docs/cold_storage                   |   31 -
 docs/conf.py                        |  277 -----
 docs/console.html                   |   71 --
 docs/index.rst                      |   29 -
 docs/index.rst~                     |   22 -
 docs/make.bat                       |  263 -----
 gui/android.py                      |   19 +-
 gui/qt/icons_rc.py                  |  202 +++-
 gui/qt/main_window.py               |   23 +-
 gui/qt/paytoedit.py                 |   23 +-
 gui/qt/transaction_dialog.py        |    4 +-
 icons.qrc                           |    1 +
 icons/keepkey.png                   |  Bin 0 -> 2213 bytes
 lib/bitcoin.py                      |    1 +
 lib/commands.py                     |   17 +-
 lib/mnemonic.py                     |    1 +
 lib/transaction.py                  |    2 +-
 lib/version.py                      |    2 +-
 lib/wordlist/chinese_simplified.txt | 2048 +++++++++++++++++++++++++++++++++++
 plugins/__init__.py                 |   10 +-
 plugins/{trezor.py => keepkey.py}   |  134 +--
 plugins/trezor.py                   |   28 +-
 plugins/trustedcoin.py              |    4 +-
 scripts/authenticator.py            |    2 +
 setup-release.py                    |    4 +-
 31 files changed, 2389 insertions(+), 1126 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git