From: Gerfried Fuchs <rhonda@debian.at>
Date: Tue, 18 May 2010 18:04:50 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.15-1~1
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=16728fd5c22256ccbfd2566942df5c07eb18a194;p=pkg%2Ft-prot.git

Merge branch 'upstream'
---

16728fd5c22256ccbfd2566942df5c07eb18a194