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)
commit940d0e9778828657a6ffbcadd35a8a84d706ac70
treeb163e0eea34c115edbd5e72eb56de944352721e7
parente7f70475f0533c310995a9dc3b2f5ee1eb58b618
parentfff76809babe6a154cd548e9bc3aa43199e9eda9
Merge branch 'people-nearby-fake-group-613558'
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