[Pkg-mozext-commits] [adblock-plus] 82/87: Merge remote-tracking branch 'jshydra/master'

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus.

commit 3a674e4b1cb48744638bedc7d63fc24a8463f3fa
Merge: 7b76c94 104e620
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 30 13:24:30 2016 -0400

    Merge remote-tracking branch 'jshydra/master'
    
    git merge -s recursive -X subtree=jshydra jshydra/master

 jshydra/abp_rewrite.py        | 38 +++++++++++---------
 jshydra/autotest.py           | 82 +++++++++++++++++++++++--------------------
 jshydra/scripts/abprewrite.js |  4 +--
 jshydra/utils.py              | 77 +++++++++++++++++++++-------------------
 4 files changed, 107 insertions(+), 94 deletions(-)


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