From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Fri, 14 Oct 2011 04:42:36 +0000 (+1100)
Subject: Merge remote-tracking branch 'pochu/upgrade-software'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f8148be971e1b51e43374473ab33e5ac8fd14a40

Merge remote-tracking branch 'pochu/upgrade-software'
---

f8148be971e1b51e43374473ab33e5ac8fd14a40