]> err.no Git - dak/commitdiff
Merge commit 'ftpmaster/master'
authorMark Hymers <mhy@debian.org>
Wed, 28 Oct 2009 10:50:53 +0000 (10:50 +0000)
committerMark Hymers <mhy@debian.org>
Wed, 28 Oct 2009 10:50:53 +0000 (10:50 +0000)
1  2 
dak/process_new.py
daklib/queue.py

Simple merge
diff --cc daklib/queue.py
Simple merge