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)
Conflicts:
dbus/dbus-sysdeps-win.c

1  2 
dbus/dbus-internals.c
test/relay.c

Simple merge
diff --cc test/relay.c
Simple merge