Merge branch 'ml--master'

README.asciidoc

@@ -136,6 +136,7 @@ Contributors, sorted by the number of commits in descending order:
 * Mathias Fussenegger
 * Larry Hynes
 * Peter Vilim
+* Matthias Lisin
 * Helen Sherwood-Taylor
 * HalosGhost
 // QUTE_AUTHORS_END

doc/help/settings.asciidoc

@@ -1026,7 +1026,7 @@ The file can be in one of the following formats:
 - One host per line
 - A zip-file of any of the above, with either only one file, or a file named 'hosts' (with any extension).
 
-Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext,]+
+Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext]+
 
 == hints
 Hinting settings.

qutebrowser/config/configdata.py

@@ -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"