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

Merge branch 'gnome-3-8'

Conflicts:
	NEWS
	configure.ac
---

d121d6a9b9d4d3a654dfd2b0e900be216f161dba