From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 21 Feb 2009 14:23:28 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=655b2eb3a319370039897127a65666b536af901e;p=deb%2Fpackages.git

Merge commit 'origin/master'

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_m68k
	lib/Packages/DoSearchContents.pm
	lib/Packages/Search.pm
	static/index.tmpl
	templates/config/archive_layout.tmpl
---

655b2eb3a319370039897127a65666b536af901e