[Pkg-mozext-commits] [gcontactsync] 07/10: Merge tag 'upstream/2.0.5'

[David Prévot]

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

taffit pushed a commit to branch master
in repository gcontactsync.

commit efd9cfd3af868c97dcb01b7986b5b533ae58d56c
Merge: 1ca8a52 f022df6
Author: David Prévot <david at tilapin.org>
Date:   Fri Jun 19 12:09:23 2015 -0400

    Merge tag 'upstream/2.0.5'
    
    Upstream version 2.0.5
    
    # gpg: Signature made ven. 19 juin 2015 12:09:16 AST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 content/AccountSetupWizard.js        |  5 +--
 content/ContactConverter.js          | 44 +-----------------------
 content/Sync.js                      | 66 ++++++++++++++++++++++++++++++++----
 content/SyncWorker.js                |  2 +-
 content/TBContact.js                 | 40 ++++++++++++++++++++--
 content/synonyms.js                  |  2 +-
 install.rdf                          |  2 +-
 locale/cs/gcontactsync.properties    |  1 +
 locale/en-US/gcontactsync.properties |  1 +
 locale/es-ES/gcontactsync.properties |  1 +
 locale/it/gcontactsync.properties    |  1 +
 11 files changed, 108 insertions(+), 57 deletions(-)

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