]> err.no Git - systemd/commit
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 13 Feb 2011 07:29:23 +0000 (08:29 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 13 Feb 2011 07:29:23 +0000 (08:29 +0100)
commitf68f4eb2fdaab3c1cde76310dac0a90b70df4fce
tree876778ced9481a5d61f07d482082eeb0b4483c68
parent3332c0a9dcba2bfd835649a73285ea6c9563746f
parent0403ec5c41db9c68f387dab36e2b08651a321abc
Merge branch 'master' into debian

Conflicts:
units/serial-getty@.service.m4
units/serial-getty@.service.m4