Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 18 May 2016 17:14:16 +0000 (18:14 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 18 May 2016 17:14:16 +0000 (18:14 +0100)

Trivial merge