]> err.no Git - dak/commitdiff
Merge remote branch 'mhy/master'
authorMark Hymers <mhy@debian.org>
Wed, 27 Jul 2011 19:08:14 +0000 (20:08 +0100)
committerMark Hymers <mhy@debian.org>
Wed, 27 Jul 2011 19:08:14 +0000 (20:08 +0100)
1  2 
config/debian-security/dak.conf
config/debian/dak.conf

Simple merge
Simple merge