Merge pull request #3311 from dibdot/adblock
authorTed Hess <thess@kitschensync.net>
Fri, 7 Oct 2016 20:37:18 +0000 (16:37 -0400)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2016 20:37:18 +0000 (16:37 -0400)
commitc8e16b22ff41bdc84548f086517aa272a002002c
tree8dc88b2426e6f7d8115852219c5120275a22de71
parentb49b2836bbddaa0b19babff8a1aadfa1af8c0644
parentdcfbfd9b1a7b4f1c433349bdaf3b05d877f3fcac
Merge pull request #3311 from dibdot/adblock

adblock: update 1.5.0