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

Merge remote-tracking branch 'pochu/error-dialog'
---

fecbf935f2b9be2cd6229099334279028fc517f1