From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 30 Apr 2012 15:11:11 +0000 (+0200)
Subject: Merge branch 'gnome-3-4'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=c182c4dc507b2b6c9a79bf93d31aa52925b0908a

Merge branch 'gnome-3-4'
---

c182c4dc507b2b6c9a79bf93d31aa52925b0908a