From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 16 Jan 2013 08:03:28 +0000 (+0100)
Subject: Merge branch 'gnome-3-6'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b5be743912a828d44439693a7c5da2d8fafba7ca

Merge branch 'gnome-3-6'

Conflicts:
	NEWS
	configure.ac
---

b5be743912a828d44439693a7c5da2d8fafba7ca