]> git.decadent.org.uk Git - dak.git/commitdiff
projects / dak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cb5ffe 057cfc7)
Merge remote branch 'stew/contents' into merge
authorJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:35 +0000 (23:43 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:35 +0000 (23:43 +0100)
* stew/contents:
  fixes from some previous bad merge

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Trivial merge
dak changes to support and test code signing