[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  telepathy-spec-wjt

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Clients should re-set the avatar on connection if the self handle is omitted from GetKnownAvatarTokens' map.

  Will Thompson <will.thompson at collabora.co.uk>
    CMs should omit the self handle from GetKnownAvatarTokens on protocols where avatars do not persist.