Merge with 0.10

author: Matthew Wild <mwild1@gmail.com>
date: Mon, 06 Jul 2015 17:07:05 +0100
parent: 6751:18f18bceb662
child: 6784:4da860edc27c
--- a/prosodyctl	Mon Jun 29 13:50:31 2015 +0100
+++ b/prosodyctl	Mon Jul 06 17:07:05 2015 +0100
@@ -841,7 +841,8 @@
 		});
 		local known_global_options = set.new({
 			"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
-			"umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings"
+			"umask", "prosodyctl_timeout", "use_ipv6", "use_libevent", "network_settings",
+			"network_backend", "http_default_host",
 		});
 		local config = config.getconfig();
 		-- Check that we have any global options (caused by putting a host at the top)