[empathy: 2/2] Merge remote branch 'glassrose/Reset-network-list-button-642264'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 6ab8e70515bcf91c79b78701ce5358d6beb0bd10
Merge: 1c70d6e c7e246e
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 15 09:19:43 2011 +0100

    Merge remote branch 'glassrose/Reset-network-list-button-642264'

 .../empathy-irc-network-chooser-dialog.c           |   33 ++++++++++
 libempathy/empathy-irc-network-manager.c           |   63 ++++++++++++++++----
 libempathy/empathy-irc-network-manager.h           |    3 +
 libempathy/empathy-irc-network.c                   |   21 ++++++-
 libempathy/empathy-irc-network.h                   |    2 +
 5 files changed, 110 insertions(+), 12 deletions(-)
---