From: Gerfried Fuchs Date: Mon, 30 Aug 2010 09:10:46 +0000 (+0200) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=68db1964413f707e0991c14491d776346a77d010;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master --- 68db1964413f707e0991c14491d776346a77d010