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

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

d29534c0758fb048ce43e3c100733e0b0dd9f242