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)
Conflicts:
libempathy/empathy-tp-file.c

1  2 
libempathy/Makefile.am
libempathy/empathy-client-factory.c
libempathy/empathy-ft-handler.c
po/POTFILES.in
src/empathy-ft-manager.c

Simple merge
Simple merge
Simple merge
diff --cc po/POTFILES.in
Simple merge
Simple merge