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)
commitb7c6186d4b17e1ee7064de7b3c5255988304bc33
treeaf0a0309fa199d3e943e7e504c55eaee39232b14
parent54917ba3ec27170caeaf07abdf30b93a4bc4167f
parente23e2b8330f63207867224ab96ef11b2aedf9cfc
Merge remote-tracking branch 'origin/gnome-3-8'
src/empathy-debug-window.c