From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 9 Dec 2007 18:26:46 +0000 (+0100)
Subject: Merge commit 'alioth/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=8290599bd43de836a8a02b547a1b1b41f9f25871;hp=8290599bd43de836a8a02b547a1b1b41f9f25871;p=deb%2Fpackages.git

Merge commit 'alioth/master' into debian-master

Conflicts:

	config.sh.sed.in
	debian/control
	lib/Packages/Dispatcher.pm
---