[empathy/gnome-2-34: 10/10] Merge branch 'report-abuse' into gnome-2-34

[Danielle Madeley <daniellem src gnome org>]

commit b3399c7cdfc007245179797e44f5edae1fc27dd3
Merge: 9060de5 2a2ff64
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Feb 15 08:22:33 2011 +1100

    Merge branch 'report-abuse' into gnome-2-34

 extensions/Channel_Interface_Conference.xml        |  635 --------------------
 .../Connection_Interface_Contact_Blocking.xml      |  172 ++++++
 extensions/Makefile.am                             |    2 +-
 extensions/misc.xml                                |    2 +-
 libempathy-gtk/empathy-contact-blocking-dialog.c   |   10 +-
 libempathy-gtk/empathy-contact-dialogs.c           |    9 +-
 libempathy-gtk/empathy-contact-menu.c              |    6 +-
 libempathy-gtk/empathy-individual-dialogs.c        |    3 +-
 libempathy-gtk/empathy-individual-view.c           |    7 +-
 libempathy/empathy-contact-list.c                  |    5 +-
 libempathy/empathy-contact-list.h                  |    6 +-
 libempathy/empathy-contact-manager.c               |    6 +-
 libempathy/empathy-individual-manager.c            |    5 +-
 libempathy/empathy-individual-manager.h            |    3 +-
 libempathy/empathy-tp-chat.c                       |   12 +-
 libempathy/empathy-tp-contact-list.c               |   52 ++-
 16 files changed, 266 insertions(+), 669 deletions(-)
---