From 96ded4535d30a703b03caae9e24f27f0cad25122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Sautret?=
 <jerome.sautret@process-one.net>
Date: Tue, 30 Oct 2007 17:38:40 +0000
Subject: * src/ejabberd_s2s.erl: don't use the resource of the sender to
 choose a s2s connection to ensure that a muc room always uses the same
 connection

Merge branch 'ejabberd_s2s'

Conflicts:

.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl

SVN Revision: 963
---
 src/configure | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/configure')

diff --git a/src/configure b/src/configure
index a18900e5a..f2980b850 100755
--- a/src/configure
+++ b/src/configure
@@ -6871,4 +6871,3 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-
-- 
cgit v1.2.3