Merge branch 'dbus-1.10-ci' into dbus-1.10
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 10:43:54 +0000 (11:43 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jul 2016 10:43:54 +0000 (11:43 +0100)

Trivial merge