[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Channel_Bundle to all.xml

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Mark ChannelBundle as a draft

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Bundle property to Channel.FUTURE

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add ChannelBundle interface