[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Divide the service-side Channel interfaces up like the client-side ones are

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update doc-generator.xsl from Telepathy spec