Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 May 2012 13:24:26 +0000 (15:24 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 21 May 2012 13:24:26 +0000 (15:24 +0200)
commit05649508bf21c519402a049ba5be367430eb58d5
treed36b827cc1b2f1643e7dced5321f4900cd3f67d0
parent26b9e04f1c40888bba66bcaace30d9f0feac45fc
parentbf32eb7eb97820578b4f878e57ca9105fc7f5147
Merge branch 'gnome-3-4'

Conflicts:
NEWS
configure.ac
src/empathy-audio-src.c
src/empathy-audio-src.c
src/empathy-call-window.c