Merge branch 'fix-ft' into to-merge
authorGuillaume Desmottes <gdesmott@gnome.org>
Tue, 17 Mar 2009 23:43:14 +0000 (23:43 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Tue, 17 Mar 2009 23:43:14 +0000 (23:43 +0000)
commit945889b6bb1cf1c05fd0cbabded207fd96ec0afb
tree38f86d510d889ebd81092768c936ceb1e84935f6
parentc1e9e11bfdd18eb2a92ae2082526264240288310
Merge branch 'fix-ft' into to-merge

From: Guillaume Desmottes <gdesmott@gnome.org>

svn path=/trunk/; revision=2713
libempathy/empathy-tp-file.c