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

[Peter Lemenkov]

commit 1bd8697c22078a3e6b4b52a91a11ac5e1c6a422a
Merge: 501ec36 a1bb46c
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun May 6 16:41:32 2012 +0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...-service-example-name-to-match-actual-one.patch |   10 ++--
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |    8 +-
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |    8 +-
 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 |   22 +++---
 ...09-Added-old-modules-for-Active-Directory.patch |    6 +-
 ...10-Disable-INET_DIST_INTERFACE-by-default.patch |    6 +-
 ejabberd.service                                   |    9 ++-
 ejabberd.spec                                      |   73 +++++++++++++++++---
 sources                                            |    2 +-
 14 files changed, 113 insertions(+), 58 deletions(-)
---