From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 16 Apr 2012 12:00:41 +0000 (+0200)
Subject: Merge branch 'gnome-3-4'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=6094f6b6b5c56f50ffa65849537b310615498c1b

Merge branch 'gnome-3-4'

Conflicts:
	configure.ac
	po/sk.po
	po/zh_CN.po
---

6094f6b6b5c56f50ffa65849537b310615498c1b