From: Joerg Jaspert Date: Mon, 1 Oct 2012 14:28:23 +0000 (+0200) Subject: Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eb3bbd6f6504930e9271f1b526673949b52e1c2;p=dak Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak * 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak: setup/README: update for recent changes Strip contrib/non-free from source names Signed-off-by: Joerg Jaspert --- 5eb3bbd6f6504930e9271f1b526673949b52e1c2