Merge branch 'master' of https://github.com/ml-/qutebrowser into ml--master

This commit is contained in:
Florian Bruhin 2015-01-04 13:35:50 +01:00
commit 6d8bffe405

View File

@ -517,7 +517,7 @@ DATA = collections.OrderedDict([
'http://winhelp2002.mvps.org/hosts.zip,'
'http://malwaredomains.lehigh.edu/files/justdomains.zip,'
'http://pgl.yoyo.org/adservers/serverlist.php?'
'hostformat=hosts&mimetype=plaintext,'),
'hostformat=hosts&mimetype=plaintext'),
"List of URLs of lists which contain hosts to block.\n\n"
"The file can be in one of the following formats:\n\n"
"- An '/etc/hosts'-like file\n"