]> err.no Git - dak/commitdiff
Merge remote branch 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Thu, 28 Jul 2011 07:46:12 +0000 (08:46 +0100)
committerMark Hymers <mhy@debian.org>
Thu, 28 Jul 2011 07:46:12 +0000 (08:46 +0100)
1  2 
config/debian-security/dak.conf
config/debian/dak.conf

Simple merge
Simple merge