From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 23 Oct 2013 16:15:56 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.8~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db8a1b053c9e7eb79e0b1235e5ed8916c3473606;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'
---

db8a1b053c9e7eb79e0b1235e5ed8916c3473606