Merge branch 'people-nearby-fake-group-613558'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 30 Mar 2010 10:37:25 +0000 (21:37 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 30 Mar 2010 10:37:25 +0000 (21:37 +1100)
1  2 
libempathy-gtk/empathy-contact-list-store.c
libempathy-gtk/empathy-contact-list-store.h
libempathy-gtk/empathy-contact-list-view.c
libempathy/empathy-tp-contact-list.c

Simple merge