[empathy: 2/2] Merge commit 'ka/tpl-0.1.1'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2f54d54b0f73b08de6be479eb62bf49b4a1162dc
Merge: 2af7013 5b1255d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Mar 1 13:41:46 2010 +0100

    Merge commit 'ka/tpl-0.1.1'

 configure.ac                        |    4 ++--
 libempathy-gtk/empathy-chat.c       |    2 +-
 libempathy-gtk/empathy-log-window.c |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)
---