From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 25 Feb 2008 00:55:42 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=5ff1dd4a73b3bd7f77e0e1b43980844840ef1b53;hp=5ff1dd4a73b3bd7f77e0e1b43980844840ef1b53;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master
---