From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 31 Oct 2013 15:26:01 +0000 (+0100)
Subject: Merge branch 'gnome-3-10'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d33879921acbd5f1d92565d7e58850aec590c293

Merge branch 'gnome-3-10'
---

d33879921acbd5f1d92565d7e58850aec590c293