[Pkg-mozext-commits] [requestpolicy] 86/257: Merge branch 'dev-1.0' into mozmill-marionette-migration

[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 0135b01653f5c94935a981f0fffbc00f0080f742
Merge: b7c2dda 00b5521
Author: Martin Kimmerle <dev at 256k.de>
Date:   Fri Oct 16 01:27:52 2015 +0200

    Merge branch 'dev-1.0' into mozmill-marionette-migration

 src/content/lib/policy-manager.alias-functions.js |  2 +-
 src/content/lib/policy-manager.jsm                |  2 +-
 src/content/lib/request-processor.compat.js       |  2 +-
 src/content/lib/request-processor.jsm             |  2 +-
 src/content/lib/request-processor.redirects.js    |  2 +-
 src/content/main/window-manager-toolbarbutton.js  |  2 +-
 src/content/main/window-manager.jsm               |  2 +-
 src/content/main/window-manager.listener.js       |  2 +-
 src/content/ui/frame.js                           | 29 ++++++++++++++---------
 tests/run-xpcshell-tests.sh                       |  9 +++----
 10 files changed, 31 insertions(+), 23 deletions(-)

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