Merge branch 'gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:32:22 +0000 (14:32 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 3 May 2013 12:32:22 +0000 (14:32 +0200)
1  2 
src/empathy-call-window.c

Simple merge