[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>
    Mark DeliveryReporting as tp:causes-havoc

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Mark Messages, HTML, DeliveryReporting as added in 0.17.5 as a draft

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Mark Messages as tp:causes-havoc