Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 30 Jun 2016 12:57:29 +0000 (13:57 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 30 Jun 2016 12:57:29 +0000 (13:57 +0100)

Trivial merge