[Pkg-mozext-commits] [greasemonkey] 02/03: Merge tag 'upstream/1.13_beta2'

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 0994cf3ba201234881ac1c35628953209866b46f
Merge: 9205fbf 51cf9ac
Author: David Prévot <taffit at debian.org>
Date:   Fri Oct 4 18:38:13 2013 -0400

    Merge tag 'upstream/1.13_beta2'
    
    Upstream version 1.13~beta2
    
    # gpg: Signature faite le ven. 04 oct. 2013 18:38:06 AST avec la clef RSA d'identifiant 44F6BD3C
    # 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

 components/greasemonkey.js           |    3 +-
 content/addons4-overlay.js           |    1 +
 content/config.js                    |   41 ++----
 content/options.js                   |    6 +-
 content/options.xul                  |   23 ++--
 defaults/preferences/greasemonkey.js |    3 +
 install.rdf                          |    2 +-
 locale/ar/greasemonkey.dtd           |    2 +
 locale/ca/greasemonkey.dtd           |    2 +
 locale/cs/greasemonkey.dtd           |    2 +
 locale/da/greasemonkey.dtd           |    2 +
 locale/de/greasemonkey.dtd           |    2 +
 locale/el/greasemonkey.dtd           |    2 +
 locale/en-US/greasemonkey.dtd        |    2 +
 locale/es-AR/greasemonkey.dtd        |    2 +
 locale/es-CL/greasemonkey.dtd        |    2 +
 locale/es-ES/greasemonkey.dtd        |    2 +
 locale/es-MX/greasemonkey.dtd        |    2 +
 locale/et/greasemonkey.dtd           |    2 +
 locale/fa/greasemonkey.dtd           |    2 +
 locale/fi/greasemonkey.dtd           |    2 +
 locale/fr/greasemonkey.dtd           |    2 +
 locale/gl/greasemonkey.dtd           |    2 +
 locale/he/greasemonkey.dtd           |    2 +
 locale/hu/greasemonkey.dtd           |    2 +
 locale/it/greasemonkey.dtd           |    2 +
 locale/ja/greasemonkey.dtd           |    2 +
 locale/ko/greasemonkey.dtd           |    2 +
 locale/lt/greasemonkey.dtd           |    2 +
 locale/nl/greasemonkey.dtd           |    2 +
 locale/pl/greasemonkey.dtd           |    2 +
 locale/pt-BR/greasemonkey.dtd        |    2 +
 locale/ro/greasemonkey.dtd           |    2 +
 locale/ru/greasemonkey.dtd           |    2 +
 locale/si/greasemonkey.dtd           |    2 +
 locale/sk/greasemonkey.dtd           |    2 +
 locale/sr/greasemonkey.dtd           |    2 +
 locale/sv-SE/greasemonkey.dtd        |    2 +
 locale/tr/greasemonkey.dtd           |    2 +
 locale/uk/greasemonkey.dtd           |    2 +
 locale/zh-CN/gm-addons.dtd           |    2 +-
 locale/zh-CN/gm-addons.properties    |    2 +-
 locale/zh-CN/greasemonkey.dtd        |    6 +-
 locale/zh-TW/greasemonkey.dtd        |    2 +
 modules/addons4.js                   |    3 +-
 {content => modules}/miscapis.js     |  153 ++++++++++++++++++++-
 modules/parseScript.js               |   10 +-
 modules/remoteScript.js              |   17 ++-
 modules/script.js                    |   65 +++++----
 modules/scriptDependency.js          |    2 +-
 modules/sync.js                      |  251 ++++++++++++++++++++++++++++++++++
 modules/util/apiLeakCheck.js         |    5 +-
 52 files changed, 569 insertions(+), 94 deletions(-)

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