From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 1 Feb 2011 14:31:19 +0000 (+0100)
Subject: Merge branch 'release'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=2c101f2718ae343a833e6f1885e11f45db8bc010

Merge branch 'release'
---

2c101f2718ae343a833e6f1885e11f45db8bc010