Merge pull request #3901 from dibdot/adblock
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 23 Jan 2017 18:20:56 +0000 (20:20 +0200)
committerGitHub <noreply@github.com>
Mon, 23 Jan 2017 18:20:56 +0000 (20:20 +0200)
adblock: update 2.1.5


Trivial merge