[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>
    Add upload-branch target which uploads stuff for discussion to (by default) people.freedesktop.org

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Recommend not giving connection managers names that are likely to cause confusion (same as the protocol, or a library they use)