[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  telepathy-glib-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    properties mixin: when SetProperties is called in the middle of an existing SetProperties call, don't trample over the existing state

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    properties mixin: fix memory leak in ListProperties implementation

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    fix loop termination condition