Merge branch 'read-etc-hosts' into next

* read-etc-hosts:
  Read in /etc/hosts before .hosts

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -5,6 +5,7 @@ next
   * Fix cmd_hublevel not properly requiring a hublevel argument
   * Fix cmd_slowjoin eating the first channel option (This fixes groups support)
   * Fix 'bl %group cmd' giving incorrect message when group/bots not found.
+  * Read in /etc/hosts on startup
 
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive

src/adns.c

@@ -1338,7 +1338,7 @@ int egg_dns_init()
 		add_dns_server("8.8.4.4");
         }
 
-//	read_hosts("/etc/hosts");
+	read_hosts("/etc/hosts");
 	read_hosts(".hosts");
     
 /* root servers for future development (tracing down)