Merge to: telepathy-gabble From: /home/cassidy/public_html/darcs/telepathy-gabble-cassidy Changes: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> use tp_debug_divert_messages instead of our own copy of it