[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    MediaStreamHandler: explain how Hold-related API should interact with notifications to the remote contact

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make Hold interface more elaborate - instead of a boolean for "held?", provide four states (unheld, held, trying to hold, trying to unhold) and a reason-code enum