Merge branch 'part-reasons'
authorWill Thompson <will.thompson@collabora.co.uk>
Wed, 1 Jul 2009 22:43:27 +0000 (23:43 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Wed, 1 Jul 2009 22:43:27 +0000 (23:43 +0100)
commit5af5dedd2bd5a57f700d3abf7a326d0462494caa
treef330c95ffc94a0688b3882da11d1f434ad2725e0
parent0e9e2124eee55872b7e6209cbcfd626c9e366e40
parentfdbb5ae44e2b82a36f7103b63e5c8a2041faea6c
Merge branch 'part-reasons'
libempathy-gtk/empathy-chat.c
libempathy/empathy-tp-chat.c