Merge pull request #2964 from dibdot/adblock
authorTed Hess <[email protected]>
Thu, 14 Jul 2016 16:53:06 +0000 (12:53 -0400)
committerGitHub <[email protected]>
Thu, 14 Jul 2016 16:53:06 +0000 (12:53 -0400)
adblock: release 1.4.0


Trivial merge