]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 2 May 2008 15:14:38 +0000 (17:14 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 2 May 2008 15:14:38 +0000 (17:14 +0200)
commit62b2941b9f0ff5ed647ecbba800f1c671577c2bd
tree4eb939a866baa89ecac5fcc2ce86ea31ff9b2f26
parentbd84d4a86349818098f7767d667ed020a415aadb
parent74d7be314bf1a32288e89a7f020910bbe37e0b60
Merge branch 'master' into ubuntu-master

Conflicts:

cron.d/100syncarchive_amd64
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
cron.d/100syncarchive_m68k
cron.d/100syncarchive_volatile
templates/html/head.tmpl
templates/html/show.tmpl
config.sh.sed.in
cron.d/100syncarchive
templates/config.tmpl
templates/html/download.tmpl
templates/html/foot.tmpl
templates/html/head.tmpl
templates/html/show.tmpl