Merge branch 'crash-659118'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 20 Sep 2011 22:32:59 +0000 (08:32 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 20 Sep 2011 22:33:21 +0000 (08:33 +1000)
commite3598826ad6ede2f72fbee91c528e621f6dce926
treec15aaa8a64537c299463acc580f833a572f24e4c
parentf9c3f78251f24515f8c667142d278641b608e260
parent378393285bb5de21c4da85b2e64e044faef6f5b6
Merge branch 'crash-659118'

Freeze exception signed off by Andre Klapper <ak-47@gmx.net> and
Matthias Clasen <matthias.clasen@gmail.com>
src/empathy-main-window.c