[ejabberd/el5/master: 62/62] Merge branch 'master' into el5/master
Peter Lemenkov
peter at fedoraproject.org
Wed Aug 18 11:21:15 UTC 2010
commit 54371b7919094fd7abfdf07575edcd4655137405
Merge: f823223 0d57c98
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Aug 18 15:20:55 2010 +0400
Merge branch 'master' into el5/master
Conflicts:
ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch
ejabberd-0003-Fixed-delays-in-s2s-connections.patch
ejabberd-0004-Introducing-mod_admin_extra.patch
ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
ejabberd.spec
...-service-example-name-to-match-actual-one.patch | 4 +-
...ention-mod_ctlextra-as-an-ejabberd-module.patch | 4 +-
...berd-0003-Fixed-delays-in-s2s-connections.patch | 4 +-
ejabberd-0004-Introducing-mod_admin_extra.patch | 4 +-
...05-Fedora-specific-changes-to-ejabberdctl.patch | 4 +-
...-Change-directory-to-readable-by-everyone.patch | 6 +-
...Install-.so-objects-with-0755-permissions.patch | 6 +-
...-Use-versioned-directory-for-storing-docs.patch | 6 +-
...L-GSSAPI-authentication-thanks-to-Mikael-.patch | 366 +++++++++++---------
ejabberd-0010-Fix-http-poll.patch | 28 ++
ejabberd.logrotate | 2 +-
ejabberd.spec | 36 ++-
12 files changed, 282 insertions(+), 188 deletions(-)
---
More information about the scm-commits
mailing list