]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 8 Jun 2011 14:14:10 +0000 (16:14 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 8 Jun 2011 14:14:10 +0000 (16:14 +0200)
1  2 
units/getty@.service.m4

Simple merge