From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 2 May 2008 12:59:33 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=cc64e538174791c4999696bb47fd1bdc585384f0;hp=cc64e538174791c4999696bb47fd1bdc585384f0;p=deb%2Fpackages.git

Merge branch 'master' into debian-master
---