From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 21 Feb 2008 13:51:40 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ad2da3295e7442dd59932ec9f3f45a9650869483;hp=ad2da3295e7442dd59932ec9f3f45a9650869483;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	templates/config.tmpl
---