[ejabberd/el6: 3/3] Merge branch 'master' into el6

[Peter Lemenkov]

commit 501ec36916ae7aff19c48049518dfcfc813dc30b
Merge: 9ad2743 1519101
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Dec 28 23:29:17 2011 +0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...-service-example-name-to-match-actual-one.patch |    6 +-
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |    8 ++--
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |   10 ++--
 ejabberd-0004-Introducing-mod_admin_extra.patch    |    8 ++--
 ...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 |    8 ++--
 ...09-Added-old-modules-for-Active-Directory.patch |    6 +-
 ...10-Disable-INET_DIST_INTERFACE-by-default.patch |    6 +-
 ...t-minute-fix-correct-version-in-configure.patch |   28 -----------
 ejabberd.service                                   |   18 +++++++
 ejabberd.spec                                      |   49 ++++++++++++--------
 ejabberd.sysconfig                                 |    4 +-
 ejabberd.tmpfiles.conf                             |    1 +
 sources                                            |    2 +-
 17 files changed, 88 insertions(+), 85 deletions(-)
---