[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-vcard-torture.py: don't use vcard['xmlns'] (doesn't work)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Check for vCard namespace being vcard-temp

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Copy XMLNS in vcard_copy(), fixing inability to edit our vCard