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

[Peter Lemenkov]

commit ff18a01f3f15f0858011fb382d5a7a65fa6c05dc
Merge: f40a1eb d665892
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Feb 24 16:39:12 2011 +0300

    Merge branch 'master' into f13/master

 ...-service-example-name-to-match-actual-one.patch |    4 +-
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |    4 +-
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |    4 +-
 ejabberd-0004-Introducing-mod_admin_extra.patch    |    4 +-
 ...05-Fedora-specific-changes-to-ejabberdctl.patch |    4 +-
 ...Install-.so-objects-with-0755-permissions.patch |    4 +-
 ...-Use-versioned-directory-for-storing-docs.patch |    4 +-
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |    4 +-
 ...09-Added-old-modules-for-Active-Directory.patch |    4 +-
 ...t-minute-fix-correct-version-in-configure.patch |    4 +-
 ...-for-online-Shared-Roster-Group-thanks-to.patch |  263 ++++++++++++++++
 ejabberd-0011-online-shared-roster-grp.patch       |  322 --------------------
 ejabberd.spec                                      |   12 +-
 13 files changed, 292 insertions(+), 345 deletions(-)
---