From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 19:23:57 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.96-1~1
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=8e56a4fc26c4f805286ad5c62157cafbe37acc58;hp=8e56a4fc26c4f805286ad5c62157cafbe37acc58;p=pkg%2Ft-prot.git

Merge branch 'upstream'
---