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

[Peter Lemenkov]

commit d6bf2c18d9018b0009ea1d77765720697640e437
Merge: 1049423 ece61a2
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Jun 3 14:27:37 2011 +0400

    Merge branch 'master' into el5

 .gitignore                                         |    1 +
 ...-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 |   10 ++++----
 ejabberd-0004-Introducing-mod_admin_extra.patch    |    6 ++--
 ...05-Fedora-specific-changes-to-ejabberdctl.patch |    6 ++--
 ...Install-.so-objects-with-0755-permissions.patch |    8 +++---
 ...-Use-versioned-directory-for-storing-docs.patch |    6 ++--
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |   19 +++++++++--------
 ...09-Added-old-modules-for-Active-Directory.patch |    4 +-
 ...t-minute-fix-correct-version-in-configure.patch |   12 +++++-----
 ejabberd.spec                                      |   22 ++++++++++++++++++-
 sources                                            |    2 +-
 13 files changed, 64 insertions(+), 44 deletions(-)
---