From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 24 Oct 2008 16:48:49 +0000 (+0200)
Subject: Merge branch 'master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=9083dcf3a523120cfb4cd905d26dada501678aea;hp=9083dcf3a523120cfb4cd905d26dada501678aea;p=deb%2Fpackages.git

Merge branch 'master' into archive-master

Conflicts:
	conf/apache.conf.sed.in
	config.sh.sed.in
	cron.d/100syncarchive_debports
	templates/config/mirrors.tmpl
---