[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    plug memory leak in GetCapabilities

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    conn-aliasing.c: plug leak of PEP request array