From: Gerfried Fuchs <rhonda@debian.org>
Date: Tue, 28 Jun 2011 06:06:42 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=6adaf6e202571324a5a430b0be8fe90d34105706;hp=6adaf6e202571324a5a430b0be8fe90d34105706;p=deb%2Fpackages.git

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