From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 5 Jun 2012 07:31:04 +0000 (+0200)
Subject: Merge branch 'gnome-3-4'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=213c011e801827daefab7bef64e0e70ba7f1d78e

Merge branch 'gnome-3-4'
---

213c011e801827daefab7bef64e0e70ba7f1d78e