[empathy: 8/8] Merge remote-tracking branch 'gulic/buttons-668464'

[Danielle Madeley <daniellem src gnome org>]

commit bda7e5e1bed8c021630ec869caeea083deeb95ad
Merge: c236099 df99b53
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Wed Mar 14 09:11:17 2012 +1100

    Merge remote-tracking branch 'gulic/buttons-668464'

 libempathy-gtk/empathy-account-widget-irc.ui      |  125 ++++++++++++---------
 libempathy-gtk/empathy-contact-blocking-dialog.ui |   13 +--
 libempathy-gtk/empathy-irc-network-dialog.c       |   17 +++-
 libempathy-gtk/empathy-status-preset-dialog.ui    |    5 +-
 src/empathy-chatrooms-window.ui                   |    5 +-
 5 files changed, 95 insertions(+), 70 deletions(-)
---