From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 17 Jun 2013 09:58:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b7c6186d4b17e1ee7064de7b3c5255988304bc33

Merge remote-tracking branch 'origin/gnome-3-8'
---

b7c6186d4b17e1ee7064de7b3c5255988304bc33