[empathy: 6/6] Merge branch 'irc-dialog'

[Will Thompson <wjt src gnome org>]

commit d9bb5b999731c247b845ba7e97393d2e25bcfeca
Merge: dcd8d50 bed17cf
Author: Will Thompson <will thompson collabora co uk>
Date:   Mon Jul 25 12:43:10 2011 +0100

    Merge branch 'irc-dialog'
    
    Fixes: <https://bugzilla.gnome.org/show_bug.cgi?id=654552>
    Reviewed-by: Xavier Claessens <xavier claessens collabora co uk>

 libempathy-gtk/empathy-account-widget-irc.c  |    1 +
 libempathy-gtk/empathy-account-widget-irc.ui |  270 ++++++++++++++++++--------
 libempathy-gtk/empathy-account-widget.c      |   16 ++-
 3 files changed, 205 insertions(+), 82 deletions(-)
---