[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Build documentation by default

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add xep.xsl from xmpp.org, and a maintainer-only Makefile target to resync it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    COPYING: explain the status of tools/xep.xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update xep.xsl to r1806. Stop pasting in the revision number, it's error-prone if there is a <?xml?> declaration

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update xep.xsl to r1803 with an even more lenient license

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Put HTML docs in $(htmldir)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    docs/Makefile.am: projects.ccu is now people.ccu