# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1365453807 -7200
# Node ID 16493e410fa847fcbb1b1a6a9e9d5e7e37fb4d3a
# Parent  116971a751d3ade3a977c74815cc94fc7f560e60# Parent  5f69fddf6fb94606e46792457d21382b7b129a9d
Merge 0.9->trunk

diff -r 116971a751d3 -r 16493e410fa8 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Mon Apr 08 17:22:15 2013 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Mon Apr 08 22:43:27 2013 +0200
@@ -140,8 +140,8 @@
 		module:log("warn", "The 'disallow_s2s' config option is deprecated, please see http://prosody.im/doc/s2s#disabling");
 		return nil, "This host has disallow_s2s set";
 	end
-	module:hook("route/remote", route_to_existing_session, 200);
-	module:hook("route/remote", route_to_new_session, 100);
+	module:hook("route/remote", route_to_existing_session, -1);
+	module:hook("route/remote", route_to_new_session, -10);
 	module:hook("s2s-authenticated", make_authenticated, -1);
 end