[empathy: 11/11] Merge branch 'part-reasons'

[Will Thompson <wjt src gnome org>]

commit 5af5dedd2bd5a57f700d3abf7a326d0462494caa
Merge: 0e9e212... fdbb5ae...
Author: Will Thompson <will thompson collabora co uk>
Date:   Wed Jul 1 23:43:27 2009 +0100

    Merge branch 'part-reasons'

 libempathy-gtk/empathy-chat.c |   73 ++++++++++++++++++++++++++++++++++------
 libempathy/empathy-tp-chat.c  |   65 +++++++++++++++++++++++++++++-------
 2 files changed, 114 insertions(+), 24 deletions(-)
---