From: Gerfried Fuchs Date: Mon, 23 May 2011 11:58:01 +0000 (+0200) Subject: Merge branch 'master' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=39c8d5a2fa0e09b0ee557c46a6f0bb34f327f18e;hp=39c8d5a2fa0e09b0ee557c46a6f0bb34f327f18e;p=deb%2Fpackages.git Merge branch 'master' into debian-master ---