From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 1 May 2015 21:08:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dbus-1.8'
X-Git-Tag: dbus-1.9.16~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9979b9916f224f17e031363bc88cab038ae01f03;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'origin/dbus-1.8'

Conflicts:
	cmake/test/CMakeLists.txt
	test/Makefile.am
---

9979b9916f224f17e031363bc88cab038ae01f03