From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 24 Apr 2013 19:31:28 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f3b479a120002b61d9000828370d743a1d854af;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac
---

1f3b479a120002b61d9000828370d743a1d854af