[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/telepathy-gabble/gabble-spec-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleMucChannel: if unknown person changes the topic, set 'subject-contact' to 0

  Senko Rasic <senko.rasic at collabora.co.uk>
    cosmetic and indentation changes

  Senko Rasic <senko.rasic at collabora.co.uk>
    Connection.Interface.Avatars: added GetKnownAvatarTokens() implementation, and test for it

  Senko Rasic <senko.rasic at collabora.co.uk>
    test-avatar-tokens.py: fix test description, remove unneeded id attribute from presence stanza