From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 16 Mar 2013 21:12:20 +0000 (+0100)
Subject: Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dbd2421bbf08cd15b61bfb66dfd40dfa55c706bf;p=dak.git

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:
  config/debian/apache.conf-incoming: add buildd-squeeze-backports alias
  config/debian/dak.conf: no longer reject uploads to squeeze-backports

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

dbd2421bbf08cd15b61bfb66dfd40dfa55c706bf