Merge pull request #2344 from dibdot/adblock
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 3 Feb 2016 18:40:08 +0000 (20:40 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Wed, 3 Feb 2016 18:40:08 +0000 (20:40 +0200)
adblock: 0.60.1


Trivial merge