[Pkg-bitcoin-commits] [electrum] 12/24: Merge tag 'upstream/2.4.2+dfsg1'

[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 a6b8ba587fc560b1308b620ebadbb900cc1a7336
Merge: aa79fb2 6453ed9
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Aug 20 23:22:17 2015 +0200

    Merge tag 'upstream/2.4.2+dfsg1'
    
    Upstream version 2.4.2+dfsg1
    
    # gpg: Signature made Thu 20 Aug 2015 23:21:55 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

 docs/_build/doctrees/environment.pickle      |   Bin 3970 -> 0 bytes
 docs/_build/doctrees/index.doctree           |   Bin 5757 -> 0 bytes
 docs/_build/html/.buildinfo                  |     4 -
 docs/_build/html/_sources/index.txt          |    29 -
 docs/_build/html/_static/ajax-loader.gif     |   Bin 673 -> 0 bytes
 docs/_build/html/_static/basic.css           |   557 --
 docs/_build/html/_static/comment-bright.png  |   Bin 3500 -> 0 bytes
 docs/_build/html/_static/comment-close.png   |   Bin 3578 -> 0 bytes
 docs/_build/html/_static/comment.png         |   Bin 3445 -> 0 bytes
 docs/_build/html/_static/default.css         |   261 -
 docs/_build/html/_static/doctools.js         |   263 -
 docs/_build/html/_static/down-pressed.png    |   Bin 347 -> 0 bytes
 docs/_build/html/_static/down.png            |   Bin 347 -> 0 bytes
 docs/_build/html/_static/file.png            |   Bin 358 -> 0 bytes
 docs/_build/html/_static/jquery-1.11.1.js    | 10308 -------------------------
 docs/_build/html/_static/jquery.js           |     4 -
 docs/_build/html/_static/minus.png           |   Bin 173 -> 0 bytes
 docs/_build/html/_static/plus.png            |   Bin 173 -> 0 bytes
 docs/_build/html/_static/pygments.css        |    63 -
 docs/_build/html/_static/searchtools.js      |   622 --
 docs/_build/html/_static/sidebar.js          |   159 -
 docs/_build/html/_static/underscore-1.3.1.js |   999 ---
 docs/_build/html/_static/underscore.js       |    31 -
 docs/_build/html/_static/up-pressed.png      |   Bin 345 -> 0 bytes
 docs/_build/html/_static/up.png              |   Bin 345 -> 0 bytes
 docs/_build/html/_static/websupport.js       |   808 --
 docs/_build/html/genindex.html               |    92 -
 docs/_build/html/index.html                  |   119 -
 docs/_build/html/objects.inv                 |   Bin 204 -> 0 bytes
 docs/_build/html/search.html                 |    99 -
 docs/_build/html/searchindex.js              |     1 -
 31 files changed, 14419 deletions(-)

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