[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

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

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Now that README explicitly says we require GNU make, turn off Automake portability warnings (fd.o #14020)