[empathy: 5/6] Merge remote-tracking branch 'danni/drag-n-drop-558942'

[Xavier Claessens <xclaesse src gnome org>]

commit 5a56118ce05c8b0579e4a7397d9c57fdd3b01937
Merge: e10a065 d954376
Author: Xavier Claessens <xclaesse gmail com>
Date:   Tue Jul 26 10:19:39 2011 +0200

    Merge remote-tracking branch 'danni/drag-n-drop-558942'

 libempathy-gtk/empathy-chat.c              |   52 ++++++++++++++++++++++++---
 libempathy-gtk/empathy-contact-list-view.c |    6 ++--
 libempathy-gtk/empathy-individual-view.c   |    6 ++--
 3 files changed, 52 insertions(+), 12 deletions(-)
---