Merge branch 'undo-close-tab'

diff --cc src/Makefile.am
Simple merge

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

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

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

diff --cc src/empathy.c
Simple merge