[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/ptlo/public_html/telepathy-spec/tp-spec-avatars

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    Channel.Type.Text: clarify that subject-contact value of 0 means unknown subject changer

  Senko Rasic <senko.rasic at collabora.co.uk>
    Connection.Interface.Avatars: introduce a new GetKnownAvatarTokens() method and deprecate GetAvatarTokens()