[Pkg-mozext-commits] [requestpolicy] 08/80: Merge branch 'hotfix-1.0.beta9.3' 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 b6b14689f6048c4e0f14ad216645262a0dd3d445
Merge: 893de33 47eca56
Author: Martin Kimmerle <dev at 256k.de>
Date:   Fri May 22 07:05:09 2015 +0200

    Merge branch 'hotfix-1.0.beta9.3' into dev-1.0

 ChangeLog.md                         |  6 ++++++
 src/content/main/about-uri.jsm       |  1 +
 src/content/settings/common.js       |  3 ++-
 src/content/settings/oldrules.js     | 26 +++++++++++++-------------
 src/content/settings/setup.js        | 12 ++++++++++--
 src/content/settings/yourpolicy.html |  2 +-
 src/content/settings/yourpolicy.js   |  2 +-
 tests/mozrunner-prefs.ini            |  6 ++++++
 8 files changed, 40 insertions(+), 18 deletions(-)

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