[empathy: 10/10] Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[Guillaume Desmottes <gdesmott src gnome org>]

commit e7f57aeaf4c3433dc48fa953791ae6598b34ae3d
Merge: 299c10e 1a35f58
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Feb 17 10:21:41 2012 +0100

    Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

 src/empathy-debug-window.c |  895 +++++++++++++++++++++++++++++---------------
 1 files changed, 591 insertions(+), 304 deletions(-)
---