Merge branch 'dbus-1.10' into dbus-1.10-ci
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Feb 2016 15:32:38 +0000 (15:32 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 12 Feb 2016 15:32:38 +0000 (15:32 +0000)

Trivial merge