Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jan 2016 15:06:43 +0000 (15:06 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 25 Jan 2016 15:06:43 +0000 (15:06 +0000)

Trivial merge