[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  telepathy-spec-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    doc-generator.xsl: stop on unhandled elements

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    replace hyphens with appropriate dashes

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    explicitly use string() on tp:version instead of passing through to identity template