From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 13 Sep 2013 14:47:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'fitzsim/fix-parent-removal-fixme'
X-Git-Tag: dbus-1.7.6~43
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a411abc9c36666efd21005f147a8a6ca2636f0da;p=thirdparty%2Fdbus.git

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
---

a411abc9c36666efd21005f147a8a6ca2636f0da