# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1356804822 -3600
# Node ID 19381ed1cc02e361e028d342cbc615137cb2d262
# Parent  a3a4de5104ee86867c225f9ea0cf68634c7089e4# Parent  5d2282a29387dbcc962c5b16de5ceadfd5bdaf52
Merge 0.9->trunk

diff -r a3a4de5104ee -r 19381ed1cc02 net/server.lua
--- a/net/server.lua	Fri Dec 28 15:14:11 2012 +0100
+++ b/net/server.lua	Sat Dec 29 19:13:42 2012 +0100
@@ -62,9 +62,8 @@
 			for k, v in pairs(event_settings) do
 				server.cfg[k] = v;
 			end
-			return true;
 		else
-			return server.changesettings(settings);
+			server.changesettings(settings);
 		end
 	end
 	load_config();