]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 15 Jan 2011 06:24:41 +0000 (07:24 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sat, 15 Jan 2011 06:24:41 +0000 (07:24 +0100)
Conflicts:
configure.ac
src/gnome-ask-password-agent.vala

1  2 
units/serial-getty@.service.m4

Simple merge