[empathy: 4/4] Merge branch 'irc-wizard-596086'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 692cee58aba936f5df2c791b89b697c1b05d208c
Merge: d02dfde 08c4500
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 26 15:39:43 2010 +0200

    Merge branch 'irc-wizard-596086'

 libempathy-gtk/empathy-account-widget-irc.c  |   41 +++++++++++++++++
 libempathy-gtk/empathy-account-widget-irc.h  |    3 +
 libempathy-gtk/empathy-account-widget-irc.ui |   63 ++++++++++++++++++++++++++
 libempathy-gtk/empathy-account-widget.c      |   12 ++++-
 src/empathy-account-assistant.c              |    3 +-
 5 files changed, 118 insertions(+), 4 deletions(-)
---