]> git.decadent.org.uk Git - dak.git/commitdiff
projects / dak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21e5bac 82e7652)
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:34:18 +0000 (14:34 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:34:18 +0000 (14:34 +0100)
* commit 'mhy/master':
  fix bad merge

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

Trivial merge
dak changes to support and test code signing