[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/telepathy-spec-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explain the conventional semantics for text channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add local-xmpp (XEP-0174) to well-known protocol registry

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    MediaSignalling: require StreamedMedia

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    StreamedMedia: require Group interface

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify the properties interface, fix markup, and comment places where we ought to be using a dictionary rather than an array of struct

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add group membership change reason Separated (for netsplits/rejoins in IRC and Salut)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    StreamedMedia: describe the expected semantics for making/receiving calls