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

1  2 
src/empathy-debug-window.c

Simple merge