From: Frank Lichtenheld <djpig@debian.org>
Date: Fri, 30 Oct 2009 10:01:25 +0000 (+0100)
Subject: Merge commit 'origin/master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=616332d8dd69eb67e61e50cbf531c698af542016;hp=616332d8dd69eb67e61e50cbf531c698af542016;p=deb%2Fpackages.git

Merge commit 'origin/master' into ubuntu-master

Conflicts:
	static/index.tmpl
	templates/config.tmpl
	templates/config/archive_layout.tmpl
	templates/config/mirrors.tmpl
---