[Pkg-mozext-commits] [gcontactsync] 14/17: Merge tag 'upstream/1.1.1'

[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 54f4fcddfcf6a286f341c16d51732287398fd6ca
Merge: ce2538c 0cde811
Author: David Prévot <taffit at debian.org>
Date:   Sat Nov 1 16:54:42 2014 -0400

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1
    
    # gpg: Signature faite le sam. 01 nov. 2014 16:54:27 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 chrome.manifest                      |   1 +
 content/AbListener.js                |  12 +-
 content/CardDialogOverlay.js         |  10 +-
 content/ContactConverter.js          | 507 +++++++++++++++++++++++++----------
 content/GContact.js                  |   6 +-
 content/Preferences.js               |   3 +-
 content/Sync.js                      |  29 +-
 content/gdata.js                     |   6 +
 content/onDrop.js                    |  15 +-
 content/options.xul                  |  22 +-
 content/synonyms.js                  |   4 +-
 defaults/preferences/gContactSync.js |   3 +
 install.rdf                          |   4 +-
 locale/en-US/options.dtd             |   2 +-
 locale/it/AccountSetupWizard.dtd     |  15 ++
 locale/it/Accounts.dtd               |  48 ++++
 locale/it/ImportDialog.dtd           |  12 +
 locale/it/gcontactsync.properties    | 297 ++++++++++++++++++++
 locale/it/options.dtd                |  66 +++++
 locale/it/overlay.dtd                |  63 +++++
 20 files changed, 940 insertions(+), 185 deletions(-)

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