]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into archive-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 24 Oct 2008 16:48:49 +0000 (18:48 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 24 Oct 2008 16:48:49 +0000 (18:48 +0200)
Conflicts:
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/100syncarchive_debports
templates/config/mirrors.tmpl


No differences found