Merge remote-tracking branch 'origin/gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
1  2 
src/empathy-debug-window.c

Simple merge