[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>
    Reference Debian #446259 as well as fd.o #12791

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS with merged changes since 0.7.3