Merge to:
telepathy-salut
From:
/home/cassidy/public_html/darcs/telepathy-salut-cassidy
Changes:
Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
salut-self: convert error code to TP_ERROR_NETWORK_ERROR when announce_activity() failed