[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: display error message when ga_service_resolver_attach failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    NEWS: copy 0.3.0 release notes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager.c: use DEBUG macro instead of g_message