From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Fri, 26 Feb 2010 22:19:13 +0000 (+1100)
Subject: Merge branch 'show-assistant-611131'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=a84e1e573eec373609ede78a56103dbab3da6046

Merge branch 'show-assistant-611131'
---

a84e1e573eec373609ede78a56103dbab3da6046