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

Trivial merge