From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 6 Nov 2015 17:36:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dbus-1.11.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1e1e2919f1e3777851d0d86a93264c742a1f6d9;p=thirdparty%2Fdbus.git

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

b1e1e2919f1e3777851d0d86a93264c742a1f6d9