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: remove the presence resolver failed timer when disposing (fix a crasher)