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)
Freeze exception signed off by Andre Klapper <ak-47@gmx.net> and
Matthias Clasen <matthias.clasen@gmail.com>

1  2 
src/empathy-main-window.c

Simple merge