Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 May 2013 14:00:49 +0000 (16:00 +0200)
Conflicts:
NEWS
configure.ac

1  2 
libempathy-gtk/empathy-log-window.c
src/empathy-debug-window.c
src/empathy-new-chatroom-dialog.c

Simple merge
Simple merge
Simple merge