]> git.deb.at Git - deb/packages.git/commitdiff
Merge remote branch 'origin/debian-master' into archive-master
authorGerfried Fuchs <rhonda@debian.org>
Tue, 11 Jan 2011 07:35:14 +0000 (08:35 +0100)
committerGerfried Fuchs <rhonda@debian.org>
Tue, 11 Jan 2011 07:35:14 +0000 (08:35 +0100)
Conflicts:
config.sh.sed.in
cron.d/100syncarchive_installer
setup-site.conf
templates/config.tmpl
templates/config/mirrors.tmpl
templates/html/homepage.tmpl


No differences found