Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 May 2015 14:37:58 +0000 (15:37 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 8 May 2015 14:37:58 +0000 (15:37 +0100)

Trivial merge