From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 29 Nov 2011 14:56:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'jonny/ft'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b5764db7cf39aeaaabc261ece49c57776540a0be

Merge remote-tracking branch 'jonny/ft'

Conflicts:
	libempathy/empathy-tp-file.c
---

b5764db7cf39aeaaabc261ece49c57776540a0be