]> git.deb.at Git - deb/packages.git/commit
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)
commit9083dcf3a523120cfb4cd905d26dada501678aea
tree1e3a66fc4478d87e2fa8f64d22c87783d3bc28cb
parent1d7caad10f40cd0a997c026b47c699b69f7c75d5
parent6f5fa1dbee1bf3a6dba1fb1aa0f6575c0c10352e
Merge branch 'master' into archive-master

Conflicts:
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/100syncarchive_debports
templates/config/mirrors.tmpl
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/120synctrans
lib/Packages/DoShow.pm
templates/config.tmpl
templates/config/mirrors.tmpl