Merge branch 'master' into mc5
authorCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:33:18 +0000 (10:33 +0200)
committerCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:33:18 +0000 (10:33 +0200)
commit8dcbfe163b293dda9bc0481e846db3bdd4e0ea98
treeccd09bc3f224492e9d8c360c0b903e11f8b593ab
parent3e8f25168aadd741ecc0fe8da4d1847eece5ff83
parentc62744a26535b8778e6053e5d7c544ca9ccc1e5f
Merge branch 'master' into mc5
configure.ac
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-theme-adium.c
libempathy-gtk/empathy-ui-utils.c
src/empathy-chat-window.c
src/empathy.c