[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-connection: coding style fix

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnection: Implement GetKnownAvatarTokens

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnection: Implement RequestAvatars

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_connection_request_avatars: unref the contact after the salut_contact_get_avatar call

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnection, emit AvatarUpdated when our own avatar is set

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Port to avahi-gobject