[Pkg-mozext-commits] [mozilla-password-editor] 02/03: Merge tag 'upstream/2.9.6'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository mozilla-password-editor.

commit b0c938cc1265b8727747378c2dd0a667cecde1fe
Merge: efc99c5 1d77e9d
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Feb 7 20:42:00 2016 +0100

    Merge tag 'upstream/2.9.6'
    
    Upstream version 2.9.6
    
    # gpg: Signature made Sun 07 Feb 2016 20:42:00 CET
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 META-INF/manifest.mf              |  24 ++++++++++++------------
 META-INF/mozilla.rsa              | Bin 4191 -> 4191 bytes
 META-INF/mozilla.sf               |   4 ++--
 content/browserMenubarOverlay.xul |  18 ++++++++++++++++--
 content/firstrun.jsm              |   4 ++--
 content/pwdmgrOverlay-sm.js       |   4 ++--
 content/pwdmgrOverlay.js          |  21 ++++++++++++++-------
 install.rdf                       |   8 ++++----
 locale/en-US/prefwindow.dtd       |   2 +-
 9 files changed, 53 insertions(+), 32 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/mozilla-password-editor.git