Merge branch 'ack'

diff --cc libempathy-gtk/empathy-chat.c
Simple merge

diff --cc libempathy/empathy-tp-chat.c
Simple merge

diff --cc src/empathy-chat-window.c
Simple merge