[empathy: 2/2] Merge commit 'istaz/handle_none'

[Xavier Claessens <xclaesse src gnome org>]

commit db0a8206853d58375960fabe1ae38267ba0576ec
Merge: 3f69fec... 1ca52da...
Author: Xavier Claessens <xclaesse gmail com>
Date:   Sun Sep 20 21:53:14 2009 +0200

    Merge commit 'istaz/handle_none'

 libempathy-gtk/empathy-chat.c |    7 +++----
 libempathy/empathy-tp-chat.c  |   11 ++++++++++-
 src/empathy.c                 |   11 +----------
 3 files changed, 14 insertions(+), 15 deletions(-)
---