Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 16 Sep 2014 16:50:14 +0000 (17:50 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 16 Sep 2014 16:50:14 +0000 (17:50 +0100)
commit1909a82a8a871781f9a488881944912c7cc367e6
treeb06581f13abfc573246a0a6a2c3d253cbe993151
parenteca7a1c5e0b2fbb4edee3aa3965d2eec451bd66b
parent8874d3a0c57c0cae97cbe426e3686936da53f649
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS
cmake/CMakeLists.txt
configure.ac
dbus/dbus-message.c
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps.h