[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Tubes: annotate return from OfferDBusTube as a Tube_ID

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate return from OfferStreamTube as a Tube_ID

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Interface_Media_Signalling: fix namespacing (add Media prefix, change Session_Handler_Type to Session_Type because it's a property of the session); fix arity of return from GetSessionHandlers (add [])

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document Property_ID