From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 27 Oct 2009 21:53:33 +0000 (+0100)
Subject: Merge commit 'alioth/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=f13529a2f31d2dd523c2a5559f62c73129e3954d;hp=f13529a2f31d2dd523c2a5559f62c73129e3954d;p=deb%2Fpackages.git

Merge commit 'alioth/master' into debian-master

Conflicts:
	conf/apache.conf.sed.in
	static/index.tmpl
	templates/config.tmpl
---