err.no Git - dak/commit

]> err.no Git - dak/commit

projects / dak / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: df1bf16 574fb13)

author	Mike O'Connor <stew@vireo.org>
	Mon, 9 Feb 2009 07:46:48 +0000 (02:46 -0500)
committer	Mike O'Connor <stew@vireo.org>
	Mon, 9 Feb 2009 07:46:48 +0000 (02:46 -0500)
commit	cd5b29ddfd8de263c085f494b9573d683913f6f3
tree	e9cc841701869bb9e531bb632a07986438c646dd	tree \| snapshot
parent	df1bf169c5b89fa9764a326bbd7a6883a8789f6b	commit \| diff
parent	574fb13e8dc253e39da7b6259617aafa74c1ec2d	commit \| diff

Merge branch 'psycopg2' into content_generation

Conflicts:

daklib/database.py

Signed-off-by: Mike O'Connor <stew@vireo.org>

dak/dak.py	diff1 \|	diff2 \|	blob \| history
dak/dakdb/update2.py	diff1 \|	diff2 \|	blob \| history
dak/process_accepted.py	diff1 \|	diff2 \|	blob \| history
dak/update_db.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.