[Pkg-mozext-commits] [adblock-plus] 48/52: 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 bbd23b04054872667a07e361fcb9e6ed4a79a03a
Merge: fc1a4d0 6c39d69
Author: David Prévot <taffit at debian.org>
Date:   Thu Jan 22 16:17:10 2015 -0400

    Merge remote-tracking branch 'jshydra/master'

 jshydra/autotest/abprewrite_source.js               |  1 +
 jshydra/autotest/test_abprewrite.js.expected        |  7 ++++---
 jshydra/autotest/test_abprewrite_module.js.expected |  7 ++++---
 jshydra/scripts/abprewrite.js                       | 10 ++++++----
 4 files changed, 15 insertions(+), 10 deletions(-)


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