Merge branch 'dbus-1.10'
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 16 Nov 2015 13:22:23 +0000 (14:22 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 16 Nov 2015 13:22:23 +0000 (14:22 +0100)
1  2 
bus/activation.c
dbus/dbus-sysdeps-win.c

Simple merge
Simple merge