[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 regression test for RequestAliases not returning on empty vCard

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    vCard manager: don't skip negative alias caching if both old and new alias are NULL

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    gabble_connection_request_aliases: remove code that should never be reached

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add test for RequestAliases/AliasesChanged