Merge branch 'dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 13 Apr 2015 13:36:21 +0000 (15:36 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 13 Apr 2015 13:41:08 +0000 (15:41 +0200)
commit718843d351aa06d25c393883b8e9bef63a0112ca
treee3d28cb8b58aed7363994016980b73f07a2b19ad
parent4101e0bc6ca18a0f45a47de7c2a364589c55c74d
parentc225ff833028bfcfc9809dcc124d9c6a737a3eac
Merge branch 'dbus-1.8'

Conflicts:
dbus/dbus-sysdeps-win.c
dbus/dbus-internals.c
test/relay.c