From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 14 Jul 2010 08:10:54 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into upstream
X-Git-Tag: upstream/1.3~1
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=be36561b174777ce551429afc891bc9b2551463f;hp=db6f31a60303e41def1a1d0705164cd5b6d75492;p=pkg%2Fbeep.git

Merge remote branch 'upstream/master' into upstream
---