]> err.no Git - dak/commit
Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak
authorJoerg Jaspert <joerg@debian.org>
Mon, 1 Oct 2012 14:28:23 +0000 (16:28 +0200)
committerJoerg Jaspert <joerg@debian.org>
Mon, 1 Oct 2012 14:28:23 +0000 (16:28 +0200)
commit5eb3bbd6f6504930e9271f1b526673949b52e1c2
tree31fa1a3ec28ed3bd6948051beab805107682b39e
parent9871525a3485698d52d2f6f5b424ee50a9e6d730
parentd765a7525626d13bfdeb4fc56e5f264a7ac86ce8
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 <joerg@debian.org>