[empathy: 4/4] Merge branch 'no-ungrouped-in-mucs-614524'

[Danielle Madeley <daniellem src gnome org>]

commit 01b686e3cd62fb958c36e9f6ad534bac1cc81c5f
Merge: a078336 c36eb1e
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu Apr 1 20:01:03 2010 +1100

    Merge branch 'no-ungrouped-in-mucs-614524'

 libempathy-gtk/empathy-chat.c               |    6 +++-
 libempathy-gtk/empathy-contact-list-store.c |   50 +++++++++++++++++----------
 libempathy-gtk/empathy-contact-list-view.c  |    4 +-
 libempathy-gtk/empathy-contact-menu.c       |   11 ++++--
 libempathy-gtk/empathy-contact-menu.h       |    3 +-
 5 files changed, 48 insertions(+), 26 deletions(-)
---