Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 24 Dec 2010 06:04:05 +0000 (17:04 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 24 Dec 2010 06:04:05 +0000 (17:04 +1100)
1  2 
src/empathy-accounts-dialog.c

Simple merge