Merge branch 'dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 5 Jan 2015 10:49:13 +0000 (11:49 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 5 Jan 2015 10:49:48 +0000 (11:49 +0100)
commitea54a97f0506df04b6d7be2af67a8c407b631823
tree39f64243cd0202b34ca6a2a6901d4ac93347b5db
parentfda9d8a44aa1bde4f2777fb9ad8650f45820fb6b
parent01af167b55ee1507212a6ec6c01027ae1b471ff3
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
cmake/config.h.cmake
cmake/test/CMakeLists.txt
dbus/dbus-sysdeps-win.c