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)
1  2 
src/libsystemd/sd-bus/bus-objects.c
src/systemd/sd-bus.h

Simple merge
Simple merge