[Pkg-mozext-commits] [requestpolicy] 219/257: Merge branch 'support-palemoon' into dev-1.0

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit 403e2a7a7a2d06d8f3f6922cb1a908aad6302c99
Merge: 51e9e85 d0c5934
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu Dec 17 11:33:22 2015 +0100

    Merge branch 'support-palemoon' into dev-1.0
    
    Fixes #739.

 src/content/lib/environment.jsm        | 18 +++++----
 src/content/lib/environment.process.js |  2 +-
 src/content/lib/old-rules.jsm          |  3 +-
 src/content/lib/policy-manager.jsm     |  4 +-
 src/content/lib/request-processor.jsm  |  8 +++-
 src/content/lib/ruleset.jsm            | 73 +++++++++++++++++++++++++---------
 src/content/lib/script-loader.jsm      | 22 +++++-----
 src/content/lib/utils/domains.jsm      |  2 +-
 src/content/main/window-manager.jsm    |  4 +-
 src/content/settings/common.js         | 12 ++++--
 src/content/settings/subscriptions.js  |  3 +-
 src/content/ui/frame.js                |  7 +++-
 src/install.rdf                        | 13 +++++-
 13 files changed, 123 insertions(+), 48 deletions(-)

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