Merge to:
telepathy-salut
From:
/home/cassidy/public_html/darcs/telepathy-salut-cassidy-to-review
Changes:
Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
salut-contact: use the activity pointer and not the activity id to check if the activity was previously announced by the contact