From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 31 Oct 2013 12:21:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/gnome-3-10'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a

Merge remote-tracking branch 'origin/gnome-3-10'

Conflicts:
	po/cs.po
	po/es.po
	po/nb.po
---

81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a