From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 27 Dec 2013 16:00:04 +0000 (+0100)
Subject: Merge branch 'gnome-3-10'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7

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

41d6dccc6ecdb3cf13ffd43533e612c2b71b71d7