Merge branch 'dbus-1.10'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 26 Oct 2015 12:49:18 +0000 (12:49 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 26 Oct 2015 12:49:18 +0000 (12:49 +0000)

Trivial merge