[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel: update copyright

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move new functionality of Channel to Channel.FUTURE pseudo-interface until we have some implementation experience

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel: add added/deprecated annotations