From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 13 Sep 2010 07:05:03 +0000 (+0200)
Subject: Merge branch 'master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4fce6c73c1628aa97d4ffcaf0d22e31e736ef9f4;hp=4fce6c73c1628aa97d4ffcaf0d22e31e736ef9f4;p=deb%2Fpackages.git

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
---