From: Gerfried Fuchs <rhonda@debian.at>
Date: Sat, 11 Sep 2010 17:36:55 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=612e2b9e36627ebfbd2cc1e86f94ae90782d1b35;hp=612e2b9e36627ebfbd2cc1e86f94ae90782d1b35;p=deb%2Fpackages.git

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