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)
1  2 
libempathy-gtk/empathy-chat.c
libempathy/empathy-tp-chat.c

Simple merge
Simple merge