]> git.decadent.org.uk Git - dak.git/commitdiff
projects / dak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab3d8bb 076955c)
Merge commit 'origin/master' into dm_upload_allowed
authorMichael Casadevall <sonicmctails@gmail.com>
Fri, 2 Jan 2009 21:58:37 +0000 (16:58 -0500)
committerMichael Casadevall <sonicmctails@gmail.com>
Fri, 2 Jan 2009 21:58:37 +0000 (16:58 -0500)
Conflicts:

ChangeLog.old

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

Trivial merge
dak changes to support and test code signing