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

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

8e692d867aa5a7679b8123a6c3f32d06c6bb0d56