From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 20 Sep 2011 22:32:59 +0000 (+1000)
Subject: Merge branch 'crash-659118'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=e3598826ad6ede2f72fbee91c528e621f6dce926

Merge branch 'crash-659118'

Freeze exception signed off by Andre Klapper <ak-47@gmx.net> and
Matthias Clasen <matthias.clasen@gmail.com>
---

e3598826ad6ede2f72fbee91c528e621f6dce926