Merge branch 'call'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:28:44 +0000 (10:28 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:28:44 +0000 (10:28 +0100)
commit8944f13286ba5293781f2d57980da284cb2aa29d
tree91aa682420a072399f03ac7fb456f62c13064add
parent981a1377f660a9d1e3660dc66613b993b78486fc
parent3f52e59aa058c16a9ba115398681a16b1e289cd1
Merge branch 'call'
configure.ac
libempathy-gtk/Makefile.am
libempathy/Makefile.am
libempathy/empathy-contact.c