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

[Peter Lemenkov]

commit 588f7af8a5ddcda899fc988f9fa2e0104104fe7d
Merge: 17d043a 36e37ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Jul 15 11:41:16 2012 +0400

    Merge branch 'master' into el5

 ...-service-example-name-to-match-actual-one.patch |    4 +-
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |  936 ---------------
 ...berd-0002-Fixed-delays-in-s2s-connections.patch |    6 +-
 ...ejabberd-0003-Introducing-mod_admin_extra.patch |  483 ++++++--
 ...04-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 +-
 ...08-Disable-INET_DIST_INTERFACE-by-default.patch |    6 +-
 ...09-Added-old-modules-for-Active-Directory.patch | 1266 --------------------
 ejabberd.spec                                      |   58 +-
 11 files changed, 437 insertions(+), 2346 deletions(-)
---