# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1453814100 -3600
# Node ID f83211f4d776fb885be051ed1a0bef3cd3cbd64f
# Parent  5286e79c6829da07405e2580556a9a2f1300dc4f# Parent  301d58705667fa678cd8d1340e6390d39d14c107
Merge 0.9->0.10

diff -r 5286e79c6829 -r f83211f4d776 plugins/mod_c2s.lua
--- a/plugins/mod_c2s.lua	Fri Jan 22 14:49:05 2016 +0100
+++ b/plugins/mod_c2s.lua	Tue Jan 26 14:15:00 2016 +0100
@@ -313,7 +313,7 @@
 	for _, session in pairs(sessions) do
 		session:close{ condition = "system-shutdown", text = reason };
 	end
-end, 1000);
+end, -100);
 
 
 
diff -r 5286e79c6829 -r f83211f4d776 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Fri Jan 22 14:49:05 2016 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Jan 26 14:15:00 2016 +0100
@@ -680,7 +680,7 @@
 	for _, session in pairs(sessions) do
 		session:close{ condition = "system-shutdown", text = reason };
 	end
-end,500);
+end, -200);