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

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

dbeb65c6896b13f3e49768d56e17d98267e35e9a