From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 17 Jan 2012 09:10:43 +0000 (+1100)
Subject: Merge branch 'master' into call1
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=25a44d2984058a38f54ab6bd68027e524342e34b

Merge branch 'master' into call1
---

25a44d2984058a38f54ab6bd68027e524342e34b