Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 14 Oct 2013 17:13:03 +0000 (13:13 -0400)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 14 Oct 2013 17:13:03 +0000 (13:13 -0400)
Conflicts:
po/pt.po
src/empathy-audio-sink.c

1  2 
configure.ac

diff --cc configure.ac
Simple merge