# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1431555861 -7200
# Node ID 365f0f885aa5a602ffb7f11d676bb268736733c2
# Parent  b2e89583d6e6bdd408c76a3d3617210842016847# Parent  93eefa92527da5a0798fc5a2bbc51cfb65df32c5
Merge 0.10->trunk

diff -r b2e89583d6e6 -r 365f0f885aa5 core/s2smanager.lua
--- a/core/s2smanager.lua	Wed May 13 22:33:40 2015 +0200
+++ b/core/s2smanager.lua	Thu May 14 00:24:21 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