From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 26 Jun 2013 08:47:31 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=dc44f6dd6245befd9e9e44ac77bb879725f7c3fc

Merge branch 'gnome-3-8'
---

dc44f6dd6245befd9e9e44ac77bb879725f7c3fc