Merge commit 'staz/dnd'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Mar 2010 17:03:25 +0000 (18:03 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Mar 2010 17:03:25 +0000 (18:03 +0100)
1  2 
libempathy-gtk/empathy-contact-list-view.c
src/empathy-chat-window.c

Simple merge