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

[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 87801cb9ab10af3582f3bec401db087768f21f6e
Merge: fcbbab9 697d6e7
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Nov 13 00:20:44 2015 +0100

    Merge tag 'upstream/2.9.4'
    
    Upstream version 2.9.4
    
    # gpg: Signature made Fri 13 Nov 2015 00:20:44 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     |  12 ++++++------
 META-INF/mozilla.rsa     | Bin 4191 -> 4191 bytes
 META-INF/mozilla.sf      |   4 ++--
 content/firstrun.jsm     |   2 +-
 content/pwdmgrOverlay.js |   2 +-
 install.rdf              |   2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

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