]> git.deb.at Git - deb/packages.git/commit
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)
commit5db229e24c1403bdb4f49ba1f7d463c8e4a274af
tree195959425b8e74a121ad120c94718992c1b503f5
parent1b6b07fe7cd8335116f2d8c1934476d667c8c107
parenta27d9febd751f81ad7d48ce64a15ba68f36ff049
Merge branch 'master' into ubuntu-master

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
bin/parse-contents
config.sh.sed.in
templates/html/show.tmpl