Merge pull request #3002 from dibdot/adblock
authorTed Hess <thess@kitschensync.net>
Thu, 28 Jul 2016 21:41:04 +0000 (17:41 -0400)
committerGitHub <noreply@github.com>
Thu, 28 Jul 2016 21:41:04 +0000 (17:41 -0400)
commit351babe8e38f392afd25b37b09114b9a60d9fc00
tree69113f59b60c6640acd8340b2744dc578e8b0121
parent7f5110c76c7d8bf7024939594510fff43e4ee0aa
parent880adb9d1a64d979a0e2009e2a43cd05864cc65c
Merge pull request #3002 from dibdot/adblock

adblock: update 1.4.2