From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue, 25 Aug 2009 10:18:05 +0000 (+0100)
Subject: Merge branch 'mc5', fixes bug #590165
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=2e6d8132394680ea42a3ebdc1daad33ff5e07b86

Merge branch 'mc5', fixes bug #590165
---

2e6d8132394680ea42a3ebdc1daad33ff5e07b86