err.no Git - dak/commit

]> err.no Git - dak/commit

projects / dak / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9af3682 56f84fd)

author	Mark Hymers <mhy@debian.org>
	Mon, 26 Oct 2009 08:58:12 +0000 (08:58 +0000)
committer	Mark Hymers <mhy@debian.org>
	Mon, 26 Oct 2009 08:58:12 +0000 (08:58 +0000)
commit	1c35448b880358d020e81339657e3435fdda9434
tree	b1bb4b76259922acebfb3e81f30121c7ef861eb0	tree \| snapshot
parent	9af3682a124014b128df6e2eb5c936cdb67c8c84	commit \| diff
parent	56f84fd91dd27a077535c9bfeb7db237537f6b9a	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
dak/generate_releases.py	diff1 \|	diff2 \|	blob \| history
dak/make_suite_file_list.py	diff1 \|	diff2 \|	blob \| history
dak/new_security_install.py	diff1 \|	diff2 \|	blob \| history
dak/override.py	diff1 \|	diff2 \|	blob \| history
dak/process_new.py	diff1 \|	diff2 \|	blob \| history
dak/process_unchecked.py	diff1 \|	diff2 \|	blob \| history
dak/transitions.py	diff1 \|	diff2 \|	blob \| history
daklib/database.py	diff1 \|	diff2 \|	blob \| history
daklib/utils.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.