* src/.cvsignore: Likewise SVN Revision: 1021
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
SVN Revision: 940
SVN Revision: 939