From: Steven Black <redacted>
Date: Sat, 31 May 2014 04:38:11 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/linuxlefty/hosts into linuxlefty-master
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9cadcae1742797d2f6004908042f96c8a97bea39;p=stevenblack-hosts.git

Merge branch 'master' of https://github.com/linuxlefty/hosts into linuxlefty-master

# By Peter Naudus
# Via Peter Naudus
* 'master' of https://github.com/linuxlefty/hosts:
  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

Conflicts:
	data/malwaredomainlist.com/hosts
	data/mvps.org/hosts
	data/someonewhocares.org/hosts
	hosts
	readme.md
---

9cadcae1742797d2f6004908042f96c8a97bea39