From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 11 May 2012 12:06:59 +0000 (+0200)
Subject: Merge branch 'gnome-3-4'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=bf6dffc184ccc08ec6bf38c4a59898d137375097

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

bf6dffc184ccc08ec6bf38c4a59898d137375097