[empathy: 5/5] Merge branch 'send-errors'

[Will Thompson <wjt src gnome org>]

commit 9eebd23f8a4a83cef5b13204a1bb377d59160bbf
Merge: d181f7b... e92cc2a...
Author: Will Thompson <will thompson collabora co uk>
Date:   Mon Aug 31 10:59:21 2009 +0100

    Merge branch 'send-errors'

 libempathy-gtk/empathy-chat.c |    4 ++--
 libempathy/empathy-message.c  |   40 ++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-message.h  |    4 ++++
 libempathy/empathy-tp-chat.c  |   26 ++++++++++++++------------
 4 files changed, 60 insertions(+), 14 deletions(-)
---