[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/sjoerd/telepathy-spec-sjoerd

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Try to clarify the definition of GetAvatarTokens a bit more

  Sjoerd Simons <sjoerd at luon.net>
    Reorder the GetKnownAvatarTokens a bit based on comments by smcv

  Sjoerd Simons <sjoerd at luon.net>
    Update the general description of the Avatars interface to not use deprecated methods