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)
commit10268f4c962a5c307dd012089d03ac1e5c07c9ca
treeea8063e9385ab76489fdf1ec96d3aaca017526fe
parentdcc9d91154890cacbc8afabd60c44582df94c434
parentbcd1f9ac9f8cae420e1f9616d94b9b518c740704
Merge branch 'gnome-3-10'

Conflicts:
po/pt.po
src/empathy-audio-sink.c
configure.ac