]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into ubuntu-master
authorGerfried Fuchs <rhonda@debian.at>
Mon, 13 Sep 2010 07:19:14 +0000 (09:19 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Mon, 13 Sep 2010 07:19:14 +0000 (09:19 +0200)
Conflicts:
config.sh.sed.in
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
lib/Packages/Search.pm
templates/config/mirrors.tmpl
templates/html/homepage.tmpl


No differences found