From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 13 Sep 2010 07:24:14 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=7a795e67fd6df4ccdbe556d22d19d8d12b4e8b8c;hp=7a795e67fd6df4ccdbe556d22d19d8d12b4e8b8c;p=deb%2Fpackages.git

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