Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 24 Nov 2014 13:05:09 +0000 (13:05 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 24 Nov 2014 13:05:09 +0000 (13:05 +0000)
commit2bc75daa2c4ae11d038b1ce576ef2ca63f26fb19
treebd2d28369b4e42618974fac44d16cacbc220549b
parent1f1649eadaabd61e1b5a38516ac6c3e72e36ef44
parent4afb7a7412bee7934e532cd33ed10634314c247f
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS
bus/connection.c