# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1346021832 -3600
# Node ID ab338242e0da23c9c3b216a352323a92c06fd304
# Parent  27b45d2c19fef6f9a61dd569365d347e18e20670# Parent  50688a2856f7922664b6ec2ad64ac91aebd78e3f
Merge 0.9->trunk

diff -r 27b45d2c19fe -r ab338242e0da core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Aug 26 19:58:59 2012 +0100
+++ b/core/s2smanager.lua	Sun Aug 26 23:57:12 2012 +0100
@@ -96,7 +96,7 @@
 	else
 		local host_session = hosts[to];
 		session.send = function(stanza)
-			host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
+			return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
 		end;
 
 		prosody.events.fire_event("s2sin-established", event_data);