]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 14 Sep 2011 07:40:32 +0000 (09:40 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 14 Sep 2011 07:40:32 +0000 (09:40 +0200)
commit92891c7f3a480c4c24d880a3c912c16a78ab287d
treec5a8e337a53bb500575736cdeeb1d34826b93e14
parent6a32a76e7ed100cf81d09c1999b04512e366d9b9
parent055bf2bf621b62b6e07af358878c761488a2e6b5
Merge branch 'master' into debian

Conflicts:
src/selinux-setup.c
units/getty@.service.m4