[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add test for setting alias

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add test for capabilities interface

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    servicetest.py: re-insert skipped lazy handlers into queue after processing event

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    remove Group interface from assumed capability list; it should only include channel types

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    refactor Twisted test setup

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    presence cache: emit capabilities-update if capabilities changed during presence update

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    presence.c: update aggregated presence when resource is removed