From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 3 Apr 2013 08:09:56 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f5d311ec7a8e609dbd94914e15d2bd983f05224c

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

f5d311ec7a8e609dbd94914e15d2bd983f05224c