From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 8 Mar 2010 08:54:28 +0000 (+0100)
Subject: Merge commit 'maiku/bug-607626'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=35e2a6150395b18e684e17f22ff4315cba0a7b2c

Merge commit 'maiku/bug-607626'
---

35e2a6150395b18e684e17f22ff4315cba0a7b2c