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

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