]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 6 Jun 2008 23:50:56 +0000 (01:50 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 6 Jun 2008 23:50:56 +0000 (01:50 +0200)
commitb689b79b3a6d8cf48f1207286efeeb28b168cd01
treed762a864c76a2fe15cc1bdf39bac76fa781306fc
parentcc64e538174791c4999696bb47fd1bdc585384f0
parent9f59a972d18eab0966908bbdcd8a4a5e14c899d4
Merge branch 'master' into debian-master

Conflicts:

conf/apache.conf.sed.in
conf/apache.conf.sed.in