[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_Text: we like the whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate Pending_Text_Message::Unix_Timestamp as type Unix_Timestamp

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unnecessary textual type annotations (now obsoleted by markup)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Connection: remove some trailing whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add some whitespace to Channel_Type_Contact_List