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

[Peter Lemenkov]

commit f40a1ebf3dd60630a458d25513aa425688341254
Merge: 6576cf7 907904f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jan 25 19:08:19 2011 +0300

    Merge branch 'master' into f13/master

 ejabberd-0011-online-shared-roster-grp.patch |  322 ++++++++++++++++++++++++++
 ejabberd.spec                                |    8 +-
 2 files changed, 329 insertions(+), 1 deletions(-)
---