]> err.no Git - dak/commit
Merge commit 'ftpmaster/master' into regexes
authorMark Hymers <mhy@debian.org>
Sat, 24 Jan 2009 19:13:26 +0000 (19:13 +0000)
committerMark Hymers <mhy@debian.org>
Sat, 24 Jan 2009 19:13:26 +0000 (19:13 +0000)
commitcdffcfe2a0e6804ed35df56c4c2aa084c2b63677
treefc6e9ccf96cc6708113ef81c00dc7fe5583d8435
parentba77095c326cc03fc5ab18423b874ff06e6fcdba
parent3d16c0a64665bdd6f8f2f394858d3b6a95ba572d
Merge commit 'ftpmaster/master' into regexes

Conflicts:

dak/make_maintainers.py
dak/new_security_install.py
dak/process_accepted.py

Signed-off-by: Mark Hymers <mhy@debian.org>
dak/examine_package.py
dak/import_ldap_fingerprints.py
dak/make_maintainers.py
dak/process_accepted.py
dak/process_new.py
dak/process_unchecked.py
daklib/queue.py
daklib/utils.py