[Pkg-mozext-commits] [greasemonkey] 20/25: Imported Upstream version 2.2

[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 0cd83cf08832dea7712206d4fc8892f7dc5dfea5
Merge: 83718c2 dccd743
Author: David Prévot <taffit at debian.org>
Date:   Wed Sep 17 14:28:06 2014 -0400

    Imported Upstream version 2.2

 components/greasemonkey.js         | 50 +++++++++++++++++-------------
 content/browser.js                 |  2 +-
 content/install.js                 |  4 +--
 content/scriptprefs.js             |  2 +-
 install.rdf                        |  2 +-
 locale/fr/gm-addons.properties     |  4 +--
 locale/fr/gm-browser.properties    |  4 +--
 locale/fr/gm-cludes.dtd            |  4 +--
 locale/fr/greasemonkey.dtd         | 10 +++---
 modules/addons4.js                 |  6 ++--
 modules/miscapis.js                |  2 ++
 modules/parseScript.js             | 13 ++++++--
 modules/remoteScript.js            |  6 ++--
 modules/script.js                  | 63 ++++++++++++++++++++++++++++++++++++--
 modules/util/getBestLocaleMatch.js | 32 +++++++++++++++++++
 modules/util/getPreferredLocale.js | 17 ++++++++++
 16 files changed, 174 insertions(+), 47 deletions(-)

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