]> git.decadent.org.uk Git - dak.git/commit
Merge commit 'djpig/djpig'
authorMark Hymers <mhy@debian.org>
Tue, 27 Oct 2009 10:04:35 +0000 (10:04 +0000)
committerMark Hymers <mhy@debian.org>
Tue, 27 Oct 2009 10:04:35 +0000 (10:04 +0000)
commit832b7e7007fae655b4850f55dd35ef95a92a5373
treeb1d88a81b3073b0726ae94a0cd1c497ea3415b5f
parent0a77b3e40ef9bcc95555fb9a791023efa3777261
parentbb848767b4c8e322b6c27c5904ac8c0e28442e6c
Merge commit 'djpig/djpig'

Conflicts:
daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>
dak/process_new.py
daklib/dbconn.py