]> git.decadent.org.uk Git - dak.git/commitdiff
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)
* '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>

Trivial merge