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

[Peter Lemenkov]

commit b7847b6d531d97f00f4493c72854be621b89107e
Merge: 6aa486b da714ab
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Oct 28 21:04:06 2012 +0400

    Merge branch 'master' into el6

 ...-service-example-name-to-match-actual-one.patch |    6 +-
 ...berd-0002-Fixed-delays-in-s2s-connections.patch |    8 +-
 ejabberd-0003-Introducing-mod_admin_extra.patch    |    4 +-
 ...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 |   22 ++++----
 ...08-Disable-INET_DIST_INTERFACE-by-default.patch |    6 +-
 ...-first-stop-listeners-then-modules-thanks.patch |   25 ++++++++
 ...e-so-ejabberdctl-number-of-arguments-erro.patch |   42 ++++++++++++++
 ...ess-when-auth-attempt-fails-thanks-to-Zac.patch |   59 ++++++++++++++++++++
 ejabberd-0012-Broken-JPEG-Photo.patch              |   25 ++++++++
 ejabberd.spec                                      |   27 +++++++--
 13 files changed, 205 insertions(+), 37 deletions(-)
---