[ejabberd/el5: 2/2] Merge branch 'master' into el5

[Peter Lemenkov]

commit d0205dd3ed142b7a9b93ca108c7f8bd52df7b490
Merge: d6bf2c1 97c9c99
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jun 18 23:37:25 2011 +0400

    Merge branch 'master' into el5

 ...-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(-)
---