[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>
    Rephrase comment to avoid needing #if 0

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rephrase comment about why we're not strictly following XEP-0153, to avoid having #if 0'd code