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)
commitdfc08c3feee35e194fdb58441752ea82f79c166a
treefee1330279c378edd632220a0dc0d4169aff6195
parentb55050dbfb73d4f724d5b04fd4ddeff21e4f7685
parent083af6c8057407a6b7895020339d19a3eb7257c7
Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'
src/empathy-accounts-dialog.c