[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>
    Channel_Type_Streamed_Media: add whitespace between signal, method, etc. elements

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Connection: introduce some whitespace for clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel: introduce some whitespace for clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Streamed_Media: we like the whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Unconflict addition of some blank lines ot Channel_Type_Streamed_Media

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Text: wrap long lines

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix conflict: whitespace vs addition of Media_Session_Type, Media_Session_Handler_Info

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Interface_Media_Signalling: add some blank lines for clarity