From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 14 Mar 2011 11:53:24 +0000 (+0000)
Subject: Merge branch 'dbus-1.4', rejecting all changes
X-Git-Tag: dbus-1.5.0~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81f2aa238beaab80489fea8056b2dbac3acc5414;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4', rejecting all changes

This commit changes nothing, but means that merge tracking won't try to
apply the reversion of d1d395774435..09c9d6406b75f to master in future.
---

81f2aa238beaab80489fea8056b2dbac3acc5414