# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331165896 0
# Node ID 470f502f02a3db0d11e22644f2fbce94e4cac669
# Parent  75b3d0c301d0622b41f83c1836edb9c825d3957b# Parent  0a9528b178fdb350d1644acfa810642106ec2a21
Merge with Maranda

diff -r 75b3d0c301d0 -r 470f502f02a3 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Wed Mar 07 20:11:01 2012 +0000
+++ b/plugins/s2s/mod_s2s.lua	Thu Mar 08 00:18:16 2012 +0000
@@ -280,7 +280,6 @@
 		end
 	end
 	(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
-	sessions[session.conn] = nil;
 	s2s_destroy_session(session, err);
 end
 
@@ -457,7 +456,7 @@
 			return; -- Connection lives, for now
 		end
 	end
-	sessions[conn]  = nil;
+	sessions[conn] = nil;
 end
 
 function listener.register_outgoing(conn, session)