From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 3 May 2013 12:32:22 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=6bdef2ef6259bda727a2cbe3a827c4a39b73a7e8

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

6bdef2ef6259bda727a2cbe3a827c4a39b73a7e8