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

[Peter Lemenkov]

commit b5740c7aa78106d44d4c032980401845917314ba
Merge: 57186ec 907904f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jan 25 19:06:49 2011 +0300

    Merge branch 'master' into f14/master

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