Merge commit 'upstream/master' into mc5
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Tue, 28 Jul 2009 09:20:27 +0000 (11:20 +0200)
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>
Tue, 28 Jul 2009 09:20:27 +0000 (11:20 +0200)
commit1d153c1cf91edce537bc64efb01b5a496b35518e
treede8ba4359a0341bd0c8c6e1a7495f4f39fb565f1
parentb50b7039d3b52f33df94e5a3526d9f43a51401ad
parent6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6
Merge commit 'upstream/master' into mc5

Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
17 files changed:
configure.ac
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-account-chooser.c
libempathy-gtk/empathy-account-widget-irc.c
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-theme-adium.c
libempathy-gtk/empathy-ui-utils.c
libempathy/empathy-chatroom-manager.c
libempathy/empathy-log-store-empathy.c
libempathy/empathy-tp-chat.c
libempathy/empathy-tp-contact-list.c
megaphone/src/megaphone-applet.c
src/empathy-accounts-dialog.ui
src/empathy-chat-window.c
src/empathy-debug-dialog.c
src/empathy-main-window.c
src/empathy.c