From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 14 Oct 2013 17:13:03 +0000 (-0400)
Subject: Merge branch 'gnome-3-10'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=10268f4c962a5c307dd012089d03ac1e5c07c9ca

Merge branch 'gnome-3-10'

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

10268f4c962a5c307dd012089d03ac1e5c07c9ca