From: Gerfried Fuchs <rhonda@debian.at>
Date: Tue, 9 Nov 2010 19:36:39 +0000 (+0100)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=8f9b848244e4a32f420260bb01362ce147f1781e;p=deb%2Fpackages.git

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

8f9b848244e4a32f420260bb01362ce147f1781e