Merge remote-tracking branch 'github/dbus-1.12' into dbus-1.12
authorSimon McVittie <smcv@collabora.com>
Tue, 28 Nov 2017 12:30:32 +0000 (12:30 +0000)
committerSimon McVittie <smcv@collabora.com>
Tue, 28 Nov 2017 12:30:32 +0000 (12:30 +0000)
commitfc2ab95515a05325b17d656c2e02b6fdc9b36211
tree627e3bb4881570c03fdba122a36fd03993dd459c
parent9a8428831bf8766ce7a2a33b76395a35a961f390
parentf634f1698425cd98f330268428cd81a237d137a4
Merge remote-tracking branch 'github/dbus-1.12' into dbus-1.12