From: Steven Black <redacted>
Date: Sat, 31 May 2014 04:48:02 +0000 (-0400)
Subject: Merge branch 'linuxlefty-master'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e0af312b9d0cdfc125193e860909b85092744368;p=stevenblack-hosts.git

Merge branch 'linuxlefty-master'

* linuxlefty-master:
  (Ibid.)
  Normalizing hosts and better duplicate detction added
  Added hpHosts (hosts-file.net) as a source
  Added support for ZIP compressed files
  Removing vim swap file
  Added yoyo.org adserver lists as data source
  Refreshed hosts from malwaredomainlist.com, mvps.org, and someonewhocares.org
---

e0af312b9d0cdfc125193e860909b85092744368