Merge remote-tracking branch 'origin/dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 1 May 2015 21:08:43 +0000 (23:08 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 1 May 2015 21:08:43 +0000 (23:08 +0200)
commit9979b9916f224f17e031363bc88cab038ae01f03
tree3493a548f7a4f7e91c3b351cddbb806a2640392f
parentc396b8ea5694852c7c89d3bf3b2ce1f1d68c0288
parent08e2b810622096e84e9c9099450bfadf5768e97e
Merge remote-tracking branch 'origin/dbus-1.8'

Conflicts:
cmake/test/CMakeLists.txt
test/Makefile.am