From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 15 Mar 2010 17:03:25 +0000 (+0100)
Subject: Merge commit 'staz/dnd'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=07d220cd50802d5d7e21f7f339984e0f3a8eb74a

Merge commit 'staz/dnd'
---

07d220cd50802d5d7e21f7f339984e0f3a8eb74a