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)
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60176

1  2 
dbus/dbus-object-tree.c

Simple merge