-
Emilio Pozuelo Monfort authored
Conflicts: libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-new-message-dialog.c libempathy/empathy-dispatcher.c libempathy/empathy-dispatcher.h src/empathy-chat-manager.c src/empathy-chat-window.c
b499944f