[Pkg-bitcoin-commits] [electrum] 02/03: Merge tag 'upstream/2.5.3'

[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 d21bf2dac4fd7023a55b14fbf7d6b28fe9446825
Merge: 7320c46 ce6a575
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Nov 12 01:39:19 2015 +0200

    Merge tag 'upstream/2.5.3'
    
    Upstream version 2.5.3
    
    # gpg: Signature made Thu 12 Nov 2015 01:39:16 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

 AUTHORS                                  |   1 +
 Electrum.egg-info/PKG-INFO               |   2 +-
 Electrum.egg-info/SOURCES.txt            |   1 +
 PKG-INFO                                 |   2 +-
 RELEASE-NOTES                            |   4 +
 electrum                                 |  26 ++--
 gui/android.py                           |   2 +-
 gui/gtk.py                               |   4 +-
 gui/kivy/main_window.py                  |  32 ++++-
 gui/kivy/uix/screens.py                  |   7 +-
 gui/qt/__init__.py                       |   4 +-
 gui/qt/amountedit.py                     |   2 +-
 gui/qt/console.py                        |   2 +-
 gui/qt/icons_rc.py                       |   2 +-
 gui/qt/installwizard.py                  |  34 ++---
 gui/qt/main_window.py                    |  35 ++---
 gui/qt/qrtextedit.py                     |   1 +
 gui/qt/seed_dialog.py                    |  18 ++-
 gui/stdio.py                             |   2 +-
 gui/text.py                              |  29 ++++-
 lib/__init__.py                          |   2 +-
 lib/commands.py                          |  30 ++---
 lib/locale/pt_BR/LC_MESSAGES/electrum.mo | Bin 32674 -> 22165 bytes
 lib/locale/th_TH/LC_MESSAGES/electrum.mo | Bin 32188 -> 512 bytes
 lib/synchronizer.py                      |  39 +++---
 lib/util.py                              |  10 +-
 lib/version.py                           |   2 +-
 lib/wallet.py                            |  47 ++++---
 plugins/btchipwallet.py                  |   4 +
 plugins/keepkey.py                       |   4 +
 plugins/labels/labels.py                 | 211 +++++++++++++++++++++++++++++++
 plugins/trezor.py                        |   4 +
 scripts/block_headers                    |   9 +-
 scripts/get_history                      |   5 +-
 scripts/watch_address                    |   9 +-
 test.py                                  |  19 +--
 36 files changed, 437 insertions(+), 168 deletions(-)

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