From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 8 Feb 2016 17:35:51 +0000 (+0000)
Subject: Merge branch 'dbus-1.10' into dbus-1.10-ci
X-Git-Tag: dbus-1.11.2~2^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac494ece062573f8c5385a997349f8dcce8d6285;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.10' into dbus-1.10-ci
---

ac494ece062573f8c5385a997349f8dcce8d6285