From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 9 Sep 2013 13:22:44 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=9129f3e31d22e7b375f3c90fd2e89e05f5e564eb

Merge branch 'gnome-3-8'

Conflicts:
	libempathy/empathy-keyring.c
---

9129f3e31d22e7b375f3c90fd2e89e05f5e564eb