[empathy/call1: 24/24] Merge branch 'master' into call1

[Danielle Madeley <daniellem src gnome org>]

commit 25a44d2984058a38f54ab6bd68027e524342e34b
Merge: f17363e 5c615ca
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Jan 17 20:10:43 2012 +1100

    Merge branch 'master' into call1

 NEWS                                               |   40 +
 configure.ac                                       |    2 +-
 help/gl/gl.po                                      |  496 ++--
 help/sl/sl.po                                      |  491 ++--
 libempathy-gtk/empathy-account-chooser.c           |    4 +
 libempathy-gtk/empathy-account-widget-irc.ui       |    1 +
 libempathy-gtk/empathy-groups-widget.c             |    2 -
 libempathy-gtk/empathy-individual-view.c           |   74 +-
 .../empathy-irc-network-chooser-dialog.c           |    5 +-
 libempathy-gtk/empathy-irc-network-chooser.c       |   41 +
 libempathy-gtk/empathy-ui-utils.c                  |   21 +-
 libempathy/empathy-account-settings.c              |   44 +
 libempathy/empathy-account-settings.h              |    3 +
 libempathy/empathy-client-factory.c                |   18 +-
 libempathy/empathy-connection-aggregator.c         |    1 +
 libempathy/empathy-utils.c                         |    6 +-
 po/gl.po                                           | 3294 ++++++++++----------
 po/nb.po                                           | 2491 ++++++++--------
 po/zh_HK.po                                        | 1738 +++++------
 po/zh_TW.po                                        | 1738 +++++------
 src/empathy-roster-window.c                        |   81 +-
 21 files changed, 5379 insertions(+), 5212 deletions(-)
---