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

Merge branch 'gnome-3-6'

Conflicts:
	po/kn.po
	po/ta.po
---

31ec75a03a132770268cf02d98f2b477747bb54f