Merge remote-tracking branch 'jonny/ft'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 29 Nov 2011 14:56:11 +0000 (15:56 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 29 Nov 2011 14:56:11 +0000 (15:56 +0100)
commitb5764db7cf39aeaaabc261ece49c57776540a0be
tree7cadc15c0f9c1c9b7ff7d21de7020201add612aa
parent67869e50ff885ea10280447edbe6ee22520e26cb
parent82b0f4038f7c257253962080270e5625dd5de152
Merge remote-tracking branch 'jonny/ft'

Conflicts:
libempathy/empathy-tp-file.c
libempathy/Makefile.am
libempathy/empathy-client-factory.c
libempathy/empathy-ft-handler.c
po/POTFILES.in
src/empathy-ft-manager.c