[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    COPYING: indicate the status of src/sha1/sha1.[ch] and tools/xep.xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    docs/: build HTML by default, now we have a properly licensed xep.xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tools/: ship xep.xsl now it's DFSG-free (thanks stpeter!)