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

[Peter Lemenkov]

commit de7d94fea8f0bd5e782cf9ab9743be05dd970cba
Merge: d0205dd 1519101
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Dec 28 23:33:27 2011 +0400

    Merge branch 'master' into el5

 .gitignore                                         |    2 +
 ...-service-example-name-to-match-actual-one.patch |   10 ++--
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |   10 ++--
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |   12 ++--
 ejabberd-0004-Introducing-mod_admin_extra.patch    |   10 ++--
 ...05-Fedora-specific-changes-to-ejabberdctl.patch |    8 +-
 ...Install-.so-objects-with-0755-permissions.patch |    6 +-
 ...-Use-versioned-directory-for-storing-docs.patch |    6 +-
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |   70 +++++++++++++-------
 ...09-Added-old-modules-for-Active-Directory.patch |    6 +-
 ...10-Disable-INET_DIST_INTERFACE-by-default.patch |    8 +-
 ...-fix-correct-version-in-configure-and-in-.patch |   43 ------------
 ejabberd.service                                   |   18 +++++
 ejabberd.spec                                      |   54 ++++++++++++----
 ejabberd.sysconfig                                 |    4 +-
 ejabberd.tmpfiles.conf                             |    1 +
 sources                                            |    2 +-
 17 files changed, 150 insertions(+), 120 deletions(-)
---