From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 4 Jan 2012 18:13:27 +0000 (+0000)
Subject: Merge commit '5df8c3db12590edd68e968975a335da9d0415e5a' into new-master
X-Git-Tag: dbus-1.5.10~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01f6419ecc89623283d2f728ab1d390b85fb2c59;p=thirdparty%2Fdbus.git

Merge commit '5df8c3db12590edd68e968975a335da9d0415e5a' into new-master

Reject its changes so that git merge-tracking will not want to revert the
changes that were unsuitable for 1.4.
---

01f6419ecc89623283d2f728ab1d390b85fb2c59