chiark / gitweb /
Merge remote-tracking branch 'origin/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 18 Aug 2014 16:12:55 +0000 (18:12 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 18 Aug 2014 16:12:55 +0000 (18:12 +0200)
commit630a4d9ea7298fb4a494662cbb4871069143ff56
tree01059a8c749b0dabfd98b6f40a587e0fcdf8bfae
parent283868e1dcd8ea7475850d9c6e7d4722c473dd50
parente0fbf1fcffe014d5af6767b29f9108c2f2444888
Merge remote-tracking branch 'origin/master'
src/libsystemd/sd-bus/bus-objects.c
src/systemd/sd-bus.h