From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 5 Jan 2015 15:00:45 +0000 (+0000)
Subject: Merge branch 'dbus-1.8'
X-Git-Tag: dbus-1.9.8~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a7cb0cb6f9d2269b7fc83d491a88f032a69d084;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac
---

4a7cb0cb6f9d2269b7fc83d491a88f032a69d084