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)
commit07d220cd50802d5d7e21f7f339984e0f3a8eb74a
tree93fd246de8fdc14d269b3e2568424ccb0ddfda75
parentf3842fe890a0819331c3a5901437c88b2e88d282
parentb27315f5de4084fff748ac12f54b6d23ee7260a7
Merge commit 'staz/dnd'
libempathy-gtk/empathy-contact-list-view.c
src/empathy-chat-window.c