[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>
    Explicitly say that service names for TCP tubes should be either an IANA service name from assignments/port-numbers or a dns-sd.org service type, rather than only referencing dns-sd.org (which itself references the IANA list)