[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>
    Remove false comment from configure.ac

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-vcard-set-and-get: ignore the AvatarUpdated signal with empty token caused by the initial vCard fetch