]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sun, 26 Dec 2010 12:01:22 +0000 (13:01 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 26 Dec 2010 12:01:22 +0000 (13:01 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge