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)
commit6bdef2ef6259bda727a2cbe3a827c4a39b73a7e8
treed42b2a6979589984c68b5ae8d5c33be64627ffba
parentc4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed
parente4dbe9ffb7c239cb2ea304a9a13fcfa6573c63e1
Merge branch 'gnome-3-8'
src/empathy-call-window.c