]> err.no Git - dak/commit
Merge commit 'ftpmaster/master' into sqlalchemy
authorMark Hymers <mhy@debian.org>
Mon, 26 Oct 2009 08:58:12 +0000 (08:58 +0000)
committerMark Hymers <mhy@debian.org>
Mon, 26 Oct 2009 08:58:12 +0000 (08:58 +0000)
commit1c35448b880358d020e81339657e3435fdda9434
treeb1bb4b76259922acebfb3e81f30121c7ef861eb0
parent9af3682a124014b128df6e2eb5c936cdb67c8c84
parent56f84fd91dd27a077535c9bfeb7db237537f6b9a
Merge commit 'ftpmaster/master' into sqlalchemy

Conflicts:
dak/override.py
dak/process_unchecked.py

Signed-off-by: Mark Hymers <mhy@debian.org>
dak/contents.py
dak/generate_releases.py
dak/make_suite_file_list.py
dak/new_security_install.py
dak/override.py
dak/process_new.py
dak/process_unchecked.py
dak/transitions.py
daklib/database.py
daklib/utils.py