[Pkg-bitcoin-commits] [electrum] 03/04: Merge tag 'upstream/2.5.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 97c8c53871ba9fa77ca11517554d4320e0882234
Merge: 26dc2b2 fee6dc9
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Nov 12 19:47:23 2015 +0200

    Merge tag 'upstream/2.5.4'
    
    Upstream version 2.5.4
    
    # gpg: Signature made Thu 12 Nov 2015 19:47:20 SAST
    # gpg:                using RSA key 0xC08990FB1F637893
    # 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=5C06568575516D0A33FFA7A3C08990FB1F637893
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600
    #      Subkey fingerprint: 5C06 5685 7551 6D0A 33FF  A7A3 C089 90FB 1F63 7893

 Electrum.egg-info/PKG-INFO |  2 +-
 PKG-INFO                   |  2 +-
 RELEASE-NOTES              |  3 +++
 gui/android.py             |  3 ---
 gui/qt/icons_rc.py         |  2 +-
 gui/qt/main_window.py      |  1 -
 gui/stdio.py               | 13 +------------
 gui/text.py                |  3 ---
 lib/bitcoin.py             |  3 +--
 lib/network.py             | 14 ++++++++++----
 lib/synchronizer.py        |  5 ++++-
 lib/version.py             |  2 +-
 lib/wallet.py              | 14 ++++++++++----
 plugins/labels.py          |  3 +++
 14 files changed, 36 insertions(+), 34 deletions(-)

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