[Pkg-mozext-commits] [requestpolicy] 45/50: Merge branch 'hotfix-1.0.beta12.2' into dev-1.0-releases

[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 06f4c1846cd3c51b843a0c903c99916635597f56
Merge: d703dc5 4d182af
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sun Jun 26 22:56:20 2016 +0200

    Merge branch 'hotfix-1.0.beta12.2' into dev-1.0-releases

 ChangeLog.md                                |  9 ++++++++-
 src/content/lib/request-processor.compat.js |  2 ++
 src/content/lib/request.jsm                 | 17 +++++++++++++++++
 src/install.rdf                             |  2 +-
 tests/content/iframe_5_about-blank.html     | 13 +++++++++++++
 tests/content/internal-destinations_1.html  | 14 ++++++++++++++
 6 files changed, 55 insertions(+), 2 deletions(-)

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