chiark / gitweb /
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd
authorLennart Poettering <lennart@poettering.net>
Sun, 11 Jul 2010 01:49:22 +0000 (03:49 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 11 Jul 2010 01:49:22 +0000 (03:49 +0200)
1  2 
src/systemctl.c

diff --cc src/systemctl.c
Simple merge