From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 13 Apr 2015 13:36:21 +0000 (+0200)
Subject: Merge branch 'dbus-1.8'
X-Git-Tag: dbus-1.9.16~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=718843d351aa06d25c393883b8e9bef63a0112ca;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.8'

Conflicts:
	dbus/dbus-sysdeps-win.c
---

718843d351aa06d25c393883b8e9bef63a0112ca