Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 17 Jun 2015 19:41:24 +0000 (20:41 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 17 Jun 2015 19:41:24 +0000 (20:41 +0100)
commit907c0b36e9fff225aa5a43b0be13f709bc4b9534
tree8321ae0a61703fa055ff342db95fe5f9f71a59f4
parent54357a96923de7c3f15c26c27901a086a0ed84a3
parent1b892db6ddb25ecb68c92c96a5fa74644c9d71b9
Merge branch 'dbus-1.8'

Conflicts:
NEWS
NEWS
bus/driver.c