]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into archive-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 11 Jun 2009 17:44:59 +0000 (19:44 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 11 Jun 2009 17:44:59 +0000 (19:44 +0200)
commitb2b9a31b9adfdd251590eb1bfb72c95d5538e392
tree080938f7520c94083724dd199c26e4f3996a243a
parent9be316ca72fbb573211c162a828c244ea8fe5224
parent53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Merge branch 'master' into archive-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
cron.d/100syncarchive_m68k
lib/Deb/Versions.pm
lib/Packages/DoSearchContents.pm
lib/Packages/DoShow.pm
static/index.tmpl
templates/config.tmpl
templates/config/mirrors.tmpl
bin/parse-packages
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/100syncarchive
cron.d/120synctrans
lib/Deb/Versions.pm
lib/Packages/Dispatcher.pm
templates/config.tmpl
templates/html/download.tmpl