[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/sjoerd/telepathy-spec-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts: Fix typo in the node name

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts.xml: Set the correct node name

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts: Let the alias attribute refer to GetAliases

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts: Add missing ) in the org.freedesktop.Telepathy.Connection.Interface.Avatars/token signature

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Aliasing: fix grammatical error

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts.xml: Don't include whitespaces in dbus-ref

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Contacts: Document the difference in semenatics between GetKnownAvatartokens and the avatar attribute

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Connection_Interface_Aliasing: Add a GetAliases method to only get cached aliases

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Rename InspectContacts and InspectableInterfaces to GetContactAttributes and ContactAttributeInterfaces respectively