[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/tp-spec-smcv-cm-extensibility

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate ConnectionManager.Interfaces as added in HEAD, and explain backwards compatibility requirements

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    ConnectionManager: add a FIXME note about the possibility of CM.I.Capabilities

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Interfaces property to ConnectionManager, for possible future expansion