Merge remote-tracking branch 'fitzsim/fix-parent-removal-fixme'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 13 Sep 2013 14:47:19 +0000 (15:47 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 13 Sep 2013 14:47:19 +0000 (15:47 +0100)
commita411abc9c36666efd21005f147a8a6ca2636f0da
tree25825d26e5557bba7933f949c9a1c95eec27f0b1
parent430c6918ae6870b1d9bf2b820970d2380410d05d
parent0b6f144f1cc40980eded278cec0892078da6657a
Merge remote-tracking branch 'fitzsim/fix-parent-removal-fixme'

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60176
dbus/dbus-object-tree.c