[empathy: 5/5] Merge branch 'blockade'

[Will Thompson <wjt src gnome org>]

commit 897bfbce7f3333362e2dd16bb5e4986aa8fa64cd
Merge: b5f6788 6ac9f42
Author: Will Thompson <will thompson collabora co uk>
Date:   Tue Aug 16 12:21:58 2011 +0100

    Merge branch 'blockade'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656167

 libempathy-gtk/empathy-contact-blocking-dialog.c   |   12 +++++++++-
 libempathy-gtk/empathy-contact-blocking-dialog.ui  |   23 +++++++++++--------
 libempathy/empathy-tp-contact-list.c               |   14 +++++++++++-
 .../test-empathy-contact-blocking-dialog.c         |    9 +-------
 4 files changed, 38 insertions(+), 20 deletions(-)
---