Merge pull request #2138 from dibdot/adblock
authorHannu Nyman <hannu.nyman@iki.fi>
Thu, 17 Dec 2015 13:46:09 +0000 (15:46 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Thu, 17 Dec 2015 13:46:09 +0000 (15:46 +0200)
adblock: feature update


Trivial merge