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

[Peter Lemenkov]

commit f0f823121bcf3c3ec4b3e4bb9ba109700d8c7deb
Merge: b7847b6 0f06d1e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jun 29 09:20:44 2013 +0400

    Merge branch 'master' into el6

 .gitignore                                         |    2 +
 ...-service-example-name-to-match-actual-one.patch |    6 +-
 ...berd-0002-Fixed-delays-in-s2s-connections.patch |   10 +-
 ejabberd-0003-Introducing-mod_admin_extra.patch    |   12 +-
 ...04-Fedora-specific-changes-to-ejabberdctl.patch |    8 +-
 ...Install-.so-objects-with-0755-permissions.patch |    6 +-
 ...-Use-versioned-directory-for-storing-docs.patch |    6 +-
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |   20 ++--
 ...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.service                                   |    3 +-
 ejabberd.spec                                      |  106 +++++++++++++-------
 sources                                            |    2 +-
 16 files changed, 112 insertions(+), 226 deletions(-)
---