[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix up README for current Salut. Also s/Gabble/Salut/ and mention XEP-0174 instead of "Bonjour"

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add README

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use -Wno-portability now we explicitly require GNU Make (fd.o #14020)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Reference the wiki page about Clique