From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 20 Jun 2008 23:26:11 +0000 (+0200)
Subject: Merge branch 'master' into archive-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=1c11bb86bf5ae74dd41f0d23193e955f806109ad;hp=1c11bb86bf5ae74dd41f0d23193e955f806109ad;p=deb%2Fpackages.git

Merge branch 'master' into archive-master
---