# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1353687422 -3600
# Node ID 99cb5170a2ea8eaa7ac6f08aa71bfdaf5187bb15
# Parent  e6fedce399eb09621982568947f2e00e034a655f# Parent  cfc038f1f923490499f9b871bca37f04c99481b3
Merge 0.9->trunk

diff -r e6fedce399eb -r 99cb5170a2ea net/server.lua
--- a/net/server.lua	Fri Nov 23 01:51:53 2012 +0100
+++ b/net/server.lua	Fri Nov 23 17:17:02 2012 +0100
@@ -43,7 +43,7 @@
 if prosody then
 	local config_get = require "core.configmanager".get;
 	local function load_config()
-		local settings = config_get("*", "core", "network_settings");
+		local settings = config_get("*", "core", "network_settings") or {};
 		if use_luaevent then
 			local event_settings = {
 				ACCEPT_DELAY = settings.event_accept_retry_interval;