From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 8 Jan 2013 11:38:01 +0000 (+0100)
Subject: Merge branch 'gnome-3-6'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=5dd66017b88e4a0d248ff75e26f12c45a959a7fa

Merge branch 'gnome-3-6'
---

5dd66017b88e4a0d248ff75e26f12c45a959a7fa