Merge branch 'sjoerd-mc5' into mc5
authorCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:32:39 +0000 (10:32 +0200)
committerCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:32:39 +0000 (10:32 +0200)
commit3e8f25168aadd741ecc0fe8da4d1847eece5ff83
tree69b2fc8984c98b9cad38d2ca5e8563da2b9aad8a
parent41e5b31c1918f40c3ba47bff2dc9ab682fe0391f
parent87070d25c5f2d9a0ecba73e8ce913eca7f183c79
Merge branch 'sjoerd-mc5' into mc5

Conflicts:
libempathy-gtk/empathy-account-widget.c
libempathy-gtk/empathy-protocol-chooser.c
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-account-widget-irc.c
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-protocol-chooser.c
libempathy/empathy-account-manager.c
libempathy/empathy-account-settings.c
libempathy/empathy-account.c
po/POTFILES.in