Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 3 Oct 2016 10:43:55 +0000 (11:43 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 3 Oct 2016 10:43:55 +0000 (11:43 +0100)

Trivial merge