[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>
    Amend muc/test-muc.py to match Alban's fix for fd.o #14467

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/tubes/test-muc-*: adjust for #14467 being fixed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-get-available-tubes.py: adjust for #14467 having been fixed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Adjust sequence of events in test-muc-ownership.py to assert that group membership is aggregated

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    ./tests/twisted/vcard/test-muc-alias.py: adjust for #14467 being fixed