]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:26:54 +0000 (21:26 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 11 Apr 2011 19:26:54 +0000 (21:26 +0200)
commitfc04e91b7db89d95918658aeaf20296e06b4ea95
tree3de3c9ce9a8e103349be244a557eb8d30e41e1c0
parent0ca6e8a1a555b04400dea6a040fca95ae6157534
parent015f26d4fd40397c745e28527eb4f758afaaffe4
Merge branch 'master' into debian

Conflicts:
units/var-lock.mount
src/fsck.c
units/getty@.service.m4