Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Nov 2014 20:59:57 +0000 (20:59 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 6 Nov 2014 20:59:57 +0000 (20:59 +0000)
commit51a609c8ba56b77aac23a2aa4be367a37adfda13
tree6c89955fef7a75e571a43d5cb6ec055ec9cdfe55
parentcec244b5961e64e85d2f59fde40ecb1a4e9c93cc
parentfc50a44527cf083da913533360ce4644cd69b243
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS
bus/activation.c
dbus/dbus-sysdeps-util-unix.c
dbus/dbus-sysdeps-util-win.c
dbus/dbus-sysdeps.h