# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331318349 0
# Node ID 87a5b7f39100a0b8006d4d68492830c22e253efb
# Parent  470f502f02a3db0d11e22644f2fbce94e4cac669# Parent  bd6dc94d60e933125262a04456c8bcdd2dad96da
Merge with Zash

diff -r bd6dc94d60e9 -r 87a5b7f39100 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Wed Mar 07 21:14:08 2012 +0100
+++ b/plugins/s2s/mod_s2s.lua	Fri Mar 09 18:39:09 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)