[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutAvahiEntryGroup: The entries hashtable exists of entries as keys, not strings.. Thus use an entry and not a string for removal

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutAvahiEntryGroup: Comment on the contents of a the entries hashtable