[empathy: 5/5] Merge remote-tracking branch 'glassrose/moving-part-functionality-to-empathy-chat-window-643295'

[Guillaume Desmottes <gdesmott src gnome org>]

commit c84e0979d36aa41e7f0d554fbbdad4e82756f8b0
Merge: 2096980 34a7a0b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri May 13 16:27:21 2011 +0200

    Merge remote-tracking branch 'glassrose/moving-part-functionality-to-empathy-chat-window-643295'

 libempathy-gtk/empathy-chat.c |   60 +++++++++++++++++++++-------------------
 libempathy-gtk/empathy-chat.h |    1 -
 libempathy/empathy-tp-chat.c  |    3 ++
 src/empathy-chat-window.c     |   45 ++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 30 deletions(-)
---