[ejabberd/f14: 2/2] Merge branch 'master' into f14
Peter Lemenkov
peter at fedoraproject.org
Sat Jun 18 19:36:20 UTC 2011
commit 0006d88719b1b32ffeaebde2a0eec0bb8f57fc1e
Merge: f567503 97c9c99
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Jun 18 23:36:01 2011 +0400
Merge branch 'master' into f14
...-service-example-name-to-match-actual-one.patch | 6 +-
...02-Add-mod_ctlextra-as-an-ejabberd-module.patch | 6 +-
...berd-0003-Fixed-delays-in-s2s-connections.patch | 6 +-
ejabberd-0004-Introducing-mod_admin_extra.patch | 6 +-
...05-Fedora-specific-changes-to-ejabberdctl.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 | 6 +-
...09-Added-old-modules-for-Active-Directory.patch | 6 +-
...-fix-correct-version-in-configure-and-in-.patch | 43 ++++++++++++++++++++
...t-minute-fix-correct-version-in-configure.patch | 28 -------------
...11-Disable-INET_DIST_INTERFACE-by-default.patch | 26 ++++++++++++
ejabberd.spec | 10 ++++-
13 files changed, 104 insertions(+), 57 deletions(-)
---
More information about the scm-commits
mailing list