Merge pull request #2049 from dibdot/adblock
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 29 Nov 2015 15:59:07 +0000 (17:59 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 29 Nov 2015 15:59:07 +0000 (17:59 +0200)
adblock: maintenance update


Trivial merge