]> git.deb.at Git - deb/packages.git/commit
Merge commit 'origin/master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Sat, 9 Feb 2008 19:43:25 +0000 (20:43 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sat, 9 Feb 2008 19:43:25 +0000 (20:43 +0100)
commite594b1fe3f88069be790f9954e66219f9ae5ae97
treeb827f2ca13e567b2a5ffca94bbe6ab3bd5b1ed04
parentc23b6c0961fff9cabeb4a072e911f7c1c983ad7e
parent34102f4b67eecf1d2b047f4eb54526dd7764f9e4
Merge commit 'origin/master' into debian-master

Conflicts:

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