]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 21 Feb 2008 13:31:09 +0000 (14:31 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 21 Feb 2008 13:31:09 +0000 (14:31 +0100)
commita82de3447c938f89e6808a3d0eca3326dd0dc389
tree7e600d9cc06778ede6e475ace7e958ff15a52baa
parent5b5db45ced6051e955e0079f53388ca098c1512e
parent694cb1687b2502b24c32f1f10b6a227fa484920e
Merge branch 'master' into debian-master

Conflicts:

templates/config.tmpl
conf/apache.conf.sed.in
templates/config.tmpl