[Telepathy] 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>
    Correctly put docstrings for Media_Stream_Type inside the <tp:docstring>

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document Media_Stream_Base_Proto so telepathy-glib will be 100% documented