From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 10 Nov 2014 17:10:09 +0000 (+0000)
Subject: Merge branch 'dbus-1.8'
X-Git-Tag: dbus-1.9.4~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f44a629679b872a11fae7a923d64b540ea3b9646;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.8'

Conflicts:
	NEWS
---

f44a629679b872a11fae7a923d64b540ea3b9646