# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269269943 0
# Node ID c29ecf0cadff623b61ea2300ccfc1d05f0bd3d46
# Parent  9f6fec37d3e22d9d120c48b5edaa814a860fc893# Parent  f47bd0f7e2e64d090e75fd3f2aa29c89441c1470
Merge 0.7->trunk

diff -r 9f6fec37d3e2 -r c29ecf0cadff core/s2smanager.lua
--- a/core/s2smanager.lua	Mon Mar 22 14:38:01 2010 +0000
+++ b/core/s2smanager.lua	Mon Mar 22 14:59:03 2010 +0000
@@ -506,6 +506,7 @@
 
 local resting_session = { -- Resting, not dead
 		destroyed = true;
+		type = "s2s_destroyed";
 		open_stream = function (session)
 			session.log("debug", "Attempt to open stream on resting session");
 		end;
diff -r 9f6fec37d3e2 -r c29ecf0cadff core/sessionmanager.lua
--- a/core/sessionmanager.lua	Mon Mar 22 14:38:01 2010 +0000
+++ b/core/sessionmanager.lua	Mon Mar 22 14:59:03 2010 +0000
@@ -68,6 +68,7 @@
 
 local resting_session = { -- Resting, not dead
 		destroyed = true;
+		type = "c2s_destroyed";
 		close = function (session)
 			session.log("debug", "Attempt to close already-closed session");
 		end;