From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 8 Oct 2013 17:42:12 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.6~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76c5deff5c50c118e40fcfd245f60f1b4f7c4cbd;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac
---

76c5deff5c50c118e40fcfd245f60f1b4f7c4cbd