From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Sun, 17 Oct 2010 22:14:11 +0000 (+1100)
Subject: Merge branch 'external-accounts'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=643dc00f6a6e60f1dae91647301505169e8c7791

Merge branch 'external-accounts'
---

643dc00f6a6e60f1dae91647301505169e8c7791