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

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

f3e31a9f4bde7ce243e92d9d43c4ce8005dd2231