From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 9 Feb 2008 19:43:25 +0000 (+0100)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=e594b1fe3f88069be790f9954e66219f9ae5ae97;hp=e594b1fe3f88069be790f9954e66219f9ae5ae97;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master

Conflicts:

	templates/config.tmpl
---