[Telepathy-commits] merge: libtelepathy

[Merge Monkey]

Merge to:

  libtelepathy

From:

  libtelepathy-daf

Changes:

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

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    apply patch by Christian Persch to make "make clean" work in clean checkout (freedesktop.org bug #12545)

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add tp-connmgr-get-info