# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1431555776 -7200
# Node ID 93eefa92527da5a0798fc5a2bbc51cfb65df32c5
# Parent  53bfca69c48b58c29d8eaa8efaf256ba7f3ca748# Parent  c6c99641006434c64a061a847b52fc08ba66f745
Merge 0.9->0.10

diff -r 53bfca69c48b -r 93eefa92527d core/s2smanager.lua
--- a/core/s2smanager.lua	Wed May 13 22:32:40 2015 +0200
+++ b/core/s2smanager.lua	Thu May 14 00:22:56 2015 +0200
@@ -64,6 +64,7 @@
 
 	function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
 	function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
+	session.sends2s = session.send;
 	return setmetatable(session, resting_session);
 end