From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 2 May 2008 15:14:38 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=62b2941b9f0ff5ed647ecbba800f1c671577c2bd;hp=62b2941b9f0ff5ed647ecbba800f1c671577c2bd;p=deb%2Fpackages.git

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