]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into archive-master
authorGerfried Fuchs <rhonda@debian.at>
Mon, 13 Sep 2010 07:05:03 +0000 (09:05 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Mon, 13 Sep 2010 07:05:03 +0000 (09:05 +0200)
commit4fce6c73c1628aa97d4ffcaf0d22e31e736ef9f4
tree15691523a84347a9b839adc3d809bc0ee1cedd87
parent819a72ebf5dc96d6b36d0a36da859e97fb2733e4
parenta27d9febd751f81ad7d48ce64a15ba68f36ff049
Merge branch 'master' into archive-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
templates/config/mirrors.tmpl
templates/html/homepage.tmpl
config.sh.sed.in
templates/config/mirrors.tmpl