From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 15 Aug 2016 23:25:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: dbus-1.11.6~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b66534945015a7ec645ed290d42dc5ba1c68e13;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'github/master'
---

7b66534945015a7ec645ed290d42dc5ba1c68e13