[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Capabilities: add whitespace between children of <interface>

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Connection: re-wrap long line

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Connection: tidy up wording of handle, handle type in NewChannel signal

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Say Handle_Type_None instead of 0

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Capabilities: move docstring, Connection_Capability_Flags to the top (moving the latter inside the <interface> in the process). Rewrap the docstring